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/tcop/postgres.c | |
| parent | a7fd03e1de38aa515bf13f590eb7688bb8418195 (diff) | |
| download | postgresql-721996d88906393b5f9fb4191e8c54726fa478fc.tar.gz postgresql-721996d88906393b5f9fb4191e8c54726fa478fc.zip | |
Cleanup patch for exec() handling.
Diffstat (limited to 'src/backend/tcop/postgres.c')
| -rw-r--r-- | src/backend/tcop/postgres.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index 76d958b4999..b60898270a6 100644 --- 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.330 2003/05/03 03:52:07 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.331 2003/05/03 05:13:20 momjian Exp $ * * NOTES * this is the "main" module of the postgres backend and @@ -1139,9 +1139,12 @@ PostgresMain(int argc, char *argv[], const char *username) Noversion = false; EchoQuery = false; - if (!IsUnderPostmaster) + if (!IsUnderPostmaster || ExecBackend) { InitializeGUCOptions(); +#ifdef EXEC_BACKEND + read_nondefault_variables(); +#endif potential_DataDir = getenv("PGDATA"); } @@ -1676,7 +1679,7 @@ PostgresMain(int argc, char *argv[], const char *username) if (!IsUnderPostmaster) { puts("\nPOSTGRES backend interactive interface "); - puts("$Revision: 1.330 $ $Date: 2003/05/03 03:52:07 $\n"); + puts("$Revision: 1.331 $ $Date: 2003/05/03 05:13:20 $\n"); } /* |