diff options
Diffstat (limited to 'src/backend/tcop')
| -rw-r--r-- | src/backend/tcop/postgres.c | 17 | ||||
| -rw-r--r-- | src/backend/tcop/utility.c | 6 |
2 files changed, 10 insertions, 13 deletions
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index eaf626ace9..53bf45dce9 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.264 2002/05/10 20:22:13 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.265 2002/05/17 01:19:18 tgl Exp $ * * NOTES * this is the "main" module of the postgres backend and @@ -37,7 +37,6 @@ #include "access/xlog.h" #include "commands/async.h" #include "commands/trigger.h" -#include "commands/variable.h" #include "libpq/libpq.h" #include "libpq/pqformat.h" #include "libpq/pqsignal.h" @@ -1184,13 +1183,10 @@ PostgresMain(int argc, char *argv[], const char *username) if (!IsUnderPostmaster) { - ResetAllOptions(true); + InitializeGUCOptions(); potential_DataDir = getenv("PGDATA"); } - /* Check for PGDATESTYLE environment variable */ - set_default_datestyle(); - /* ---------------- * parse command line arguments * @@ -1273,9 +1269,10 @@ PostgresMain(int argc, char *argv[], const char *username) else /* * -d 0 allows user to prevent postmaster debug from - * propogating to backend. + * propagating to backend. */ - SetConfigOption("server_min_messages", "notice", PGC_POSTMASTER, PGC_S_ARGV); + SetConfigOption("server_min_messages", "notice", + ctx, gucsource); } break; @@ -1292,7 +1289,7 @@ PostgresMain(int argc, char *argv[], const char *username) /* * Use european date formats. */ - EuroDates = true; + SetConfigOption("datestyle", "euro", ctx, gucsource); break; case 'F': @@ -1691,7 +1688,7 @@ PostgresMain(int argc, char *argv[], const char *username) if (!IsUnderPostmaster) { puts("\nPOSTGRES backend interactive interface "); - puts("$Revision: 1.264 $ $Date: 2002/05/10 20:22:13 $\n"); + puts("$Revision: 1.265 $ $Date: 2002/05/17 01:19:18 $\n"); } /* diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c index 9a9c062559..e72d8dfccf 100644 --- a/src/backend/tcop/utility.c +++ b/src/backend/tcop/utility.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/tcop/utility.c,v 1.153 2002/04/30 01:26:26 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/tcop/utility.c,v 1.154 2002/05/17 01:19:18 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -36,7 +36,6 @@ #include "commands/trigger.h" #include "commands/user.h" #include "commands/vacuum.h" -#include "commands/variable.h" #include "commands/view.h" #include "miscadmin.h" #include "nodes/makefuncs.h" @@ -48,6 +47,7 @@ #include "rewrite/rewriteRemove.h" #include "tcop/utility.h" #include "utils/acl.h" +#include "utils/guc.h" #include "utils/lsyscache.h" #include "utils/syscache.h" #include "access/xlog.h" @@ -718,7 +718,7 @@ ProcessUtility(Node *parsetree, { VariableSetStmt *n = (VariableSetStmt *) parsetree; - SetPGVariable(n->name, n->args); + SetPGVariable(n->name, n->args, n->is_local); } break; |