diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2006-07-29 03:02:56 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2006-07-29 03:02:56 +0000 |
| commit | 033a477e9e268ee75a30cd825281448d9b10b53d (patch) | |
| tree | 7508d80b93554d9e67633b635b490df359609213 /src/backend/bootstrap/bootstrap.c | |
| parent | 46d9c2ec8f908f1eebeceef48e6ad84deb03bc2d (diff) | |
Adjust initialization sequence for timezone_abbreviations so that
it's handled just about like timezone; in particular, don't try
to read anything during InitializeGUCOptions. Should solve current
startup failure on Windows, and avoid wasted cycles if a nondefault
setting is specified in postgresql.conf too. Possibly we need to
think about a more general solution for handling 'expensive to set'
GUC options.
Diffstat (limited to 'src/backend/bootstrap/bootstrap.c')
| -rw-r--r-- | src/backend/bootstrap/bootstrap.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c index 8d765605b10..150c29db3f6 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 - * $PostgreSQL: pgsql/src/backend/bootstrap/bootstrap.c,v 1.220 2006/07/14 14:52:17 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/bootstrap/bootstrap.c,v 1.221 2006/07/29 03:02:55 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -358,6 +358,8 @@ BootstrapMain(int argc, char *argv[]) proc_exit(1); /* If timezone is not set, determine what the OS uses */ pg_timezone_initialize(); + /* If timezone_abbreviations is not set, select default */ + pg_timezone_abbrev_initialize(); } /* Validate we have been given a reasonable-looking DataDir */ |