aboutsummaryrefslogtreecommitdiff
path: root/src/backend/tcop/postgres.c
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2003-05-06 04:16:35 +0000
committerBruce Momjian <bruce@momjian.us>2003-05-06 04:16:35 +0000
commit77a0219ab12eb25f05f96260f7e0e2c077438f2d (patch)
tree8db15cfba48405c96111db8a4698b7956d61fd73 /src/backend/tcop/postgres.c
parent2cf57c8f8d060711c1ad7e1dd6cc1115a2839b47 (diff)
downloadpostgresql-77a0219ab12eb25f05f96260f7e0e2c077438f2d.tar.gz
postgresql-77a0219ab12eb25f05f96260f7e0e2c077438f2d.zip
Comment out some of the conditional tests until we have exec().
Reorder non-default variable loading until PGDATA is defined.
Diffstat (limited to 'src/backend/tcop/postgres.c')
-rw-r--r--src/backend/tcop/postgres.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index d9172655e2a..69bf6cb297b 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");
}
/*