From ca4af308c32d03db5fbacb54d6e583ceb904f268 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Fri, 9 Sep 2011 17:59:11 -0400 Subject: Simplify handling of the timezone GUC by making initdb choose the default. We were doing some amazingly complicated things in order to avoid running the very expensive identify_system_timezone() procedure during GUC initialization. But there is an obvious fix for that, which is to do it once during initdb and have initdb install the system-specific default into postgresql.conf, as it already does for most other GUC variables that need system-environment-dependent defaults. This means that the timezone (and log_timezone) settings no longer have any magic behavior in the server. Per discussion. --- src/backend/tcop/postgres.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/backend/tcop/postgres.c') diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index b708328926a..072d50c3951 100644 --- a/src/backend/tcop/postgres.c +++ b/src/backend/tcop/postgres.c @@ -3537,10 +3537,6 @@ PostgresMain(int argc, char *argv[], const char *username) { if (!SelectConfigFiles(userDoption, progname)) 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(); } /* -- cgit v1.2.3