database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-30 21:42:05 +03:00
Code Activity

Comment out some of the conditional tests until we have exec().

Browse Source 
Reorder non-default variable loading until PGDATA is defined.
This commit is contained in:
Bruce Momjian
2003-05-06 04:16:35 +00:00
parent 2cf57c8f8d
commit 77a0219ab1
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
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.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)
{
/*