diff options
Diffstat (limited to 'src/backend/bootstrap/bootstrap.c')
| -rw-r--r-- | src/backend/bootstrap/bootstrap.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c index c7fcb400873..3aca65e845c 100644 --- a/src/backend/bootstrap/bootstrap.c +++ b/src/backend/bootstrap/bootstrap.c @@ -8,14 +8,13 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/bootstrap/bootstrap.c,v 1.178 2004/04/01 21:28:43 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/bootstrap/bootstrap.c,v 1.179 2004/05/21 05:07:56 tgl Exp $ * *------------------------------------------------------------------------- */ #include "postgres.h" #include <unistd.h> -#include <time.h> #include <signal.h> #include <setjmp.h> #ifdef HAVE_GETOPT_H @@ -34,6 +33,7 @@ #include "executor/executor.h" #include "libpq/pqsignal.h" #include "miscadmin.h" +#include "pgtime.h" #include "storage/freespace.h" #include "storage/ipc.h" #include "storage/pg_shmem.h" @@ -392,8 +392,8 @@ BootstrapMain(int argc, char *argv[]) if (IsUnderPostmaster) { #ifdef EXEC_BACKEND - read_nondefault_variables(); read_backend_variables(backendID,NULL); + read_nondefault_variables(); SSDataBaseInit(xlogop); #endif @@ -401,6 +401,9 @@ BootstrapMain(int argc, char *argv[]) else ProcessConfigFile(PGC_POSTMASTER); + /* If timezone is not set, determine what the OS uses */ + pg_timezone_initialize(); + if (IsUnderPostmaster) { /* |