postgres.git / summary / log / commit / refs

commit    f99e72fa51d1a0de26dff3878832c9e2ed3f4f12
Author:   Tom Lane <tgl@sss.pgh.pa.us>
Date:     Sat Aug 04 01:42:34 2007 +0000
First released in: 8.0.14, 8.1.10, 8.2.5

    Suppress time zone name (%Z) when logging timestamps in xlog.c startup
    on Windows.  This is yet another manifestation of the problem that Windows
    returns time zone names that may be in a different encoding than we are using.
    I've put a better solution in HEAD, but the back branches need a simple patch.
    Per report from Hiroshi Saito.


 src/backend/access/transam/xlog.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index e7e55ce4d56..466c3f5dd18 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.222.2.4 2006/06/22 20:43:20 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.222.2.5 2007/08/04 01:42:34 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -3908,7 +3908,12 @@ str_time(time_t tnow)
 	static char buf[128];
 
 	strftime(buf, sizeof(buf),
+			 /* Win32 timezone names are too long so don't print them */
+#ifndef WIN32
 			 "%Y-%m-%d %H:%M:%S %Z",
+#else
+			 "%Y-%m-%d %H:%M:%S",
+#endif
 			 localtime(&tnow));
 
 	return buf;


[parent: 6c77d7d73b55]