diff options
Diffstat (limited to 'src/backend/bootstrap/bootstrap.c')
| -rw-r--r-- | src/backend/bootstrap/bootstrap.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c index 51f432b1a0..1a13786a04 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.128 2002/05/05 00:03:28 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.129 2002/05/17 01:19:16 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -249,7 +249,7 @@ BootstrapMain(int argc, char *argv[]) dbName = NULL; if (!IsUnderPostmaster) { - ResetAllOptions(true); + InitializeGUCOptions(); potential_DataDir = getenv("PGDATA"); /* Null if no PGDATA * variable */ } @@ -263,12 +263,13 @@ BootstrapMain(int argc, char *argv[]) break; case 'd': { - /* Turn on debugging for the postmaster. */ + /* Turn on debugging for the bootstrap process. */ char *debugstr = palloc(strlen("debug") + strlen(optarg) + 1); sprintf(debugstr, "debug%s", optarg); - /* We use PGC_S_SESSION because we will reset in backend */ - SetConfigOption("server_min_messages", debugstr, PGC_POSTMASTER, PGC_S_ARGV); - SetConfigOption("client_min_messages", debugstr, PGC_POSTMASTER, PGC_S_ARGV); + SetConfigOption("server_min_messages", debugstr, + PGC_POSTMASTER, PGC_S_ARGV); + SetConfigOption("client_min_messages", debugstr, + PGC_POSTMASTER, PGC_S_ARGV); pfree(debugstr); break; } |