Index: src/backend/bootstrap/bootstrap.c
===================================================================
RCS file: /cvsroot/pgsql-server/src/backend/bootstrap/bootstrap.c,v
retrieving revision 1.151
diff -c -c -r1.151 bootstrap.c
*** src/backend/bootstrap/bootstrap.c	3 May 2003 03:52:07 -0000	1.151
--- src/backend/bootstrap/bootstrap.c	3 May 2003 05:13:01 -0000
***************
*** 236,242 ****
  	 *
  	 * If we are running under the postmaster, this is done already.
  	 */
! 	if (!IsUnderPostmaster)
  		MemoryContextInit();
  
  	/*
--- 236,242 ----
  	 *
  	 * If we are running under the postmaster, this is done already.
  	 */
! 	if (!IsUnderPostmaster || ExecBackend)
  		MemoryContextInit();
  
  	/*
***************
*** 245,253 ****
  
  	/* Set defaults, to be overriden by explicit options below */
  	dbName = NULL;
! 	if (!IsUnderPostmaster)
  	{
  		InitializeGUCOptions();
  		potential_DataDir = getenv("PGDATA");	/* Null if no PGDATA
  												 * variable */
  	}
--- 245,256 ----
  
  	/* Set defaults, to be overriden by explicit options below */
  	dbName = NULL;
! 	if (!IsUnderPostmaster || ExecBackend)
  	{
  		InitializeGUCOptions();
+ #ifdef EXEC_BACKEND
+ 		read_nondefault_variables();
+ #endif
  		potential_DataDir = getenv("PGDATA");	/* Null if no PGDATA
  												 * variable */
  	}
***************
*** 306,312 ****
  		AttachSharedMemoryAndSemaphores();
  	}
  	
! 	if (!IsUnderPostmaster)
  	{
  		if (!potential_DataDir)
  		{
--- 309,315 ----
  		AttachSharedMemoryAndSemaphores();
  	}
  	
! 	if (!IsUnderPostmaster || ExecBackend)
  	{
  		if (!potential_DataDir)
  		{
Index: src/backend/postmaster/postmaster.c
===================================================================
RCS file: /cvsroot/pgsql-server/src/backend/postmaster/postmaster.c,v
retrieving revision 1.320
diff -c -c -r1.320 postmaster.c
*** src/backend/postmaster/postmaster.c	3 May 2003 03:52:07 -0000	1.320
--- src/backend/postmaster/postmaster.c	3 May 2003 05:13:06 -0000
***************
*** 2243,2252 ****
  	/* Reset MyProcPid to new backend's pid */
  	MyProcPid = getpid();
  
- #ifdef EXEC_BACKEND
- 	read_nondefault_variables();
- #endif
- 
  	/*
  	 * Initialize libpq and enable reporting of elog errors to the client.
  	 * Must do this now because authentication uses libpq to send
--- 2243,2248 ----
Index: src/backend/tcop/postgres.c
===================================================================
RCS file: /cvsroot/pgsql-server/src/backend/tcop/postgres.c,v
retrieving revision 1.330
diff -c -c -r1.330 postgres.c
*** src/backend/tcop/postgres.c	3 May 2003 03:52:07 -0000	1.330
--- src/backend/tcop/postgres.c	3 May 2003 05:13:10 -0000
***************
*** 1139,1147 ****
  	Noversion = false;
  	EchoQuery = false;
  
! 	if (!IsUnderPostmaster)
  	{
  		InitializeGUCOptions();
  		potential_DataDir = getenv("PGDATA");
  	}
  
--- 1139,1150 ----
  	Noversion = false;
  	EchoQuery = false;
  
! 	if (!IsUnderPostmaster || ExecBackend)
  	{
  		InitializeGUCOptions();
+ #ifdef EXEC_BACKEND
+ 		read_nondefault_variables();
+ #endif
  		potential_DataDir = getenv("PGDATA");
  	}