diff options
| author | Bruce Momjian <bruce@momjian.us> | 2003-05-03 05:13:20 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2003-05-03 05:13:20 +0000 |
| commit | 721996d88906393b5f9fb4191e8c54726fa478fc (patch) | |
| tree | face686b16b0ab408c20382cf24b193b09a67169 /src/backend/bootstrap/bootstrap.c | |
| parent | a7fd03e1de38aa515bf13f590eb7688bb8418195 (diff) | |
| download | postgresql-721996d88906393b5f9fb4191e8c54726fa478fc.tar.gz postgresql-721996d88906393b5f9fb4191e8c54726fa478fc.zip | |
Cleanup patch for exec() handling.
Diffstat (limited to 'src/backend/bootstrap/bootstrap.c')
| -rw-r--r-- | src/backend/bootstrap/bootstrap.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c index d7db3cd375c..f848de00144 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.151 2003/05/03 03:52:07 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.152 2003/05/03 05:13:18 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -236,7 +236,7 @@ BootstrapMain(int argc, char *argv[]) * * If we are running under the postmaster, this is done already. */ - if (!IsUnderPostmaster) + if (!IsUnderPostmaster || ExecBackend) MemoryContextInit(); /* @@ -245,9 +245,12 @@ BootstrapMain(int argc, char *argv[]) /* Set defaults, to be overriden by explicit options below */ dbName = NULL; - if (!IsUnderPostmaster) + if (!IsUnderPostmaster || ExecBackend) { InitializeGUCOptions(); +#ifdef EXEC_BACKEND + read_nondefault_variables(); +#endif potential_DataDir = getenv("PGDATA"); /* Null if no PGDATA * variable */ } @@ -306,7 +309,7 @@ BootstrapMain(int argc, char *argv[]) AttachSharedMemoryAndSemaphores(); } - if (!IsUnderPostmaster) + if (!IsUnderPostmaster || ExecBackend) { if (!potential_DataDir) { |