Setting statistic options from SET PG_OPTIONS caused a backend crash

because StatFp never got set in that case.  Set it immediately before
use to eliminate such problems.

diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index b84ae7b537ed7ababd764b1d1c89169d97f8ff80..bcb63bb2193e13cf84d8637478a0c12009cb9149 100644 (file)
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.152 2000/04/23 00:13:16 tgl Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.153 2000/04/28 05:07:34 tgl Exp $
  *
  * NOTES
  *   this is the "main" module of the postgres backend and
@@ -129,7 +129,7 @@ extern int  NBuffers;
 static bool EchoQuery = false; /* default don't echo */
 time_t     tim;
 char       pg_pathname[MAXPGPATH];
-FILE      *StatFp;
+FILE      *StatFp = NULL;
 
 /* ----------------
  *     people who want to use EOF should #define DONTUSENEWLINE in
@@ -1105,7 +1105,6 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[])
                 * ----------------
                 */
                ShowStats = 1;
-               StatFp = stderr;
                break;
 
            case 'T':
@@ -1127,7 +1126,6 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[])
                 *  caution: -s can not be used together with -t.
                 * ----------------
                 */
-               StatFp = stderr;
                switch (optarg[0])
                {
                    case 'p':
@@ -1455,7 +1453,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[])
    if (!IsUnderPostmaster)
    {
        puts("\nPOSTGRES backend interactive interface ");
-       puts("$Revision: 1.152 $ $Date: 2000/04/23 00:13:16 $\n");
+       puts("$Revision: 1.153 $ $Date: 2000/04/28 05:07:34 $\n");
    }
 
    /*
@@ -1694,6 +1692,12 @@ ShowUsage(void)
        r.ru_stime.tv_usec += 1000000;
    }
 
+   /*
+    * Set output destination if not otherwise set
+    */
+   if (StatFp == NULL)
+       StatFp = stderr;
+
    /*
     * the only stats we don't show here are for memory usage -- i can't
     * figure out how to interpret the relevant fields in the rusage