aboutsummaryrefslogtreecommitdiff
path: root/src/backend/postmaster/postmaster.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend/postmaster/postmaster.c')
-rw-r--r--src/backend/postmaster/postmaster.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 9d4bc76755a..13492bfec8b 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -37,7 +37,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.496 2006/07/25 01:23:34 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.497 2006/07/29 03:02:55 tgl Exp $
*
* NOTES
*
@@ -691,11 +691,17 @@ PostmasterMain(int argc, char *argv[])
* should be done during GUC initialization, but because it can take as
* much as several seconds, we delay it until after we've created the
* postmaster.pid file. This prevents problems with boot scripts that
- * expect the pidfile to appear quickly.)
+ * expect the pidfile to appear quickly. Also, we avoid problems with
+ * trying to locate the timezone files too early in initialization.)
*/
pg_timezone_initialize();
/*
+ * Likewise, init timezone_abbreviations if not already set.
+ */
+ pg_timezone_abbrev_initialize();
+
+ /*
* Initialize SSL library, if specified.
*/
#ifdef USE_SSL