diff options
| author | Bruce Momjian <bruce@momjian.us> | 2003-05-06 04:16:35 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2003-05-06 04:16:35 +0000 |
| commit | 77a0219ab12eb25f05f96260f7e0e2c077438f2d (patch) | |
| tree | 8db15cfba48405c96111db8a4698b7956d61fd73 /src/backend/bootstrap/bootstrap.c | |
| parent | 2cf57c8f8d060711c1ad7e1dd6cc1115a2839b47 (diff) | |
Comment out some of the conditional tests until we have exec().
Reorder non-default variable loading until PGDATA is defined.
Diffstat (limited to 'src/backend/bootstrap/bootstrap.c')
| -rw-r--r-- | src/backend/bootstrap/bootstrap.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c index f848de00144..c97fbf44662 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.152 2003/05/03 05:13:18 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.153 2003/05/06 04:16:35 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -236,7 +236,7 @@ BootstrapMain(int argc, char *argv[]) * * If we are running under the postmaster, this is done already. */ - if (!IsUnderPostmaster || ExecBackend) + if (!IsUnderPostmaster /* when exec || ExecBackend */) MemoryContextInit(); /* @@ -245,12 +245,9 @@ BootstrapMain(int argc, char *argv[]) /* Set defaults, to be overriden by explicit options below */ dbName = NULL; - if (!IsUnderPostmaster || ExecBackend) + if (!IsUnderPostmaster /* when exec || ExecBackend*/) { InitializeGUCOptions(); -#ifdef EXEC_BACKEND - read_nondefault_variables(); -#endif potential_DataDir = getenv("PGDATA"); /* Null if no PGDATA * variable */ } @@ -309,7 +306,7 @@ BootstrapMain(int argc, char *argv[]) AttachSharedMemoryAndSemaphores(); } - if (!IsUnderPostmaster || ExecBackend) + if (!IsUnderPostmaster /* when exec || ExecBackend*/) { if (!potential_DataDir) { @@ -328,6 +325,10 @@ BootstrapMain(int argc, char *argv[]) Assert(DataDir); ValidatePgVersion(DataDir); +#ifdef EXEC_BACKEND + read_nondefault_variables(); +#endif + if (IsUnderPostmaster) { /* |