database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-29 10:41:53 +03:00
Code Activity

Cleanup patch for exec() handling.

Browse Source
This commit is contained in:
Bruce Momjian
2003-05-03 05:13:20 +00:00
parent a7fd03e1de
commit 721996d889
3 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/backend/bootstrap/bootstrap.c
View File

@ -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)
{