From 77a0219ab12eb25f05f96260f7e0e2c077438f2d Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Tue, 6 May 2003 04:16:35 +0000
Subject: [PATCH] Comment out some of the conditional tests until we have
 exec().

Reorder non-default variable loading until PGDATA is defined.
---
 src/backend/bootstrap/bootstrap.c | 15 ++++++++-------
 src/backend/tcop/postgres.c       | 13 +++++++------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c
index f848de0014..c97fbf4466 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.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)
 	{
 		/*
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index d9172655e2..69bf6cb297 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.333 2003/05/06 00:20:33 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.334 2003/05/06 04:16:35 momjian Exp $
  *
  * NOTES
  *	  this is the "main" module of the postgres backend and
@@ -1803,12 +1803,9 @@ PostgresMain(int argc, char *argv[], const char *username)
 	Noversion = false;
 	EchoQuery = false;
 
-	if (!IsUnderPostmaster || ExecBackend)
+	if (!IsUnderPostmaster /* when exec || ExecBackend*/)
 	{
 		InitializeGUCOptions();
-#ifdef EXEC_BACKEND
-		read_nondefault_variables();
-#endif
 		potential_DataDir = getenv("PGDATA");
 	}
 
@@ -2182,6 +2179,10 @@ PostgresMain(int argc, char *argv[], const char *username)
 	}
 	Assert(DataDir);
 
+#ifdef EXEC_BACKEND
+	read_nondefault_variables();
+#endif
+
 	/*
 	 * Set up signal handlers and masks.
 	 *
@@ -2343,7 +2344,7 @@ PostgresMain(int argc, char *argv[], const char *username)
 	if (!IsUnderPostmaster)
 	{
 		puts("\nPOSTGRES backend interactive interface ");
-		puts("$Revision: 1.333 $ $Date: 2003/05/06 00:20:33 $\n");
+		puts("$Revision: 1.334 $ $Date: 2003/05/06 04:16:35 $\n");
 	}
 
 	/*