From fffafc5dca40ceca6912facca47c2e78e7e7c7e6 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Sat, 4 Aug 2007 01:42:24 +0000 Subject: [PATCH] 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 98c610dcadd..4ab57244b0b 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.258 2006/11/30 18:29:11 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.258.2.1 2007/08/04 01:42:24 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -4221,7 +4221,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;