From: Magnus Hagander <magnus@hagander.net>
Date: Tue, 6 Apr 2010 20:35:15 +0000 (+0000)
Subject: Log the actual timezone name that we fail to look up the values for in
X-Git-Tag: REL8_3_11~26
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0ae9a9d25f9081aa2339448293926630621963a2;p=thirdparty%2Fpostgresql.git

Log the actual timezone name that we fail to look up the values for in
case the registry data doesn't follow the format we expect, to facilitate
debugging.
---

diff --git a/src/timezone/pgtz.c b/src/timezone/pgtz.c
index 13dbb553d78..83f3b727c76 100644
--- a/src/timezone/pgtz.c
+++ b/src/timezone/pgtz.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/timezone/pgtz.c,v 1.58.2.1 2008/07/01 03:41:01 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/timezone/pgtz.c,v 1.58.2.2 2010/04/06 20:35:15 mha Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1086,7 +1086,8 @@ identify_system_timezone(void)
 		if ((r = RegQueryValueEx(key, "Std", NULL, NULL, zonename, &namesize)) != ERROR_SUCCESS)
 		{
 			ereport(WARNING,
-					(errmsg_internal("could not query value for 'std' to identify Windows timezone: %i", (int) r)));
+					(errmsg_internal("could not query value for 'std' to identify Windows timezone \"%s\": %i",
+									 keyname, (int) r)));
 			RegCloseKey(key);
 			break;
 		}
@@ -1102,7 +1103,8 @@ identify_system_timezone(void)
 		if ((r = RegQueryValueEx(key, "Dlt", NULL, NULL, zonename, &namesize)) != ERROR_SUCCESS)
 		{
 			ereport(WARNING,
-					(errmsg_internal("could not query value for 'dlt' to identify Windows timezone: %i", (int) r)));
+					(errmsg_internal("could not query value for 'dlt' to identify Windows timezone \"%s\": %i",
+									 keyname, (int) r)));
 			RegCloseKey(key);
 			break;
 		}