diff options
Diffstat (limited to 'src/backend/bootstrap/bootstrap.c')
| -rw-r--r-- | src/backend/bootstrap/bootstrap.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c index 532d1bc3a82..b49d5ef8bf3 100644 --- a/src/backend/bootstrap/bootstrap.c +++ b/src/backend/bootstrap/bootstrap.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.86 2000/06/17 23:41:27 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.87 2000/06/22 22:31:17 petere Exp $ * *------------------------------------------------------------------------- */ @@ -35,6 +35,7 @@ #include "tcop/tcopprot.h" #include "utils/builtins.h" #include "utils/fmgroids.h" +#include "utils/guc.h" #include "utils/lsyscache.h" #include "utils/portal.h" @@ -248,8 +249,11 @@ BootstrapMain(int argc, char *argv[]) Quiet = false; Noversion = false; dbName = NULL; - DataDir = getenv("PGDATA"); /* Null if no PGDATA variable */ - IsUnderPostmaster = false; + if (!IsUnderPostmaster) + { + ResetAllOptions(); + DataDir = getenv("PGDATA"); /* Null if no PGDATA variable */ + } while ((flag = getopt(argc, argv, "D:dCQxpB:F")) != EOF) { @@ -275,7 +279,7 @@ BootstrapMain(int argc, char *argv[]) xloginit = true; break; case 'p': - IsUnderPostmaster = true; + /* indicates fork from postmaster */ break; case 'B': NBuffers = atoi(optarg); |