From 033a477e9e268ee75a30cd825281448d9b10b53d Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Sat, 29 Jul 2006 03:02:56 +0000 Subject: 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. --- src/backend/tcop/postgres.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/backend/tcop/postgres.c') diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index 0c50ff38a5a..1f8cda61b34 100644 --- a/src/backend/tcop/postgres.c +++ b/src/backend/tcop/postgres.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.492 2006/07/14 14:52:23 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.493 2006/07/29 03:02:56 tgl Exp $ * * NOTES * this is the "main" module of the postgres backend and @@ -2758,6 +2758,8 @@ PostgresMain(int argc, char *argv[], const char *username) 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(); } if (PostAuthDelay) -- cgit v1.2.3