diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2007-08-04 01:42:34 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2007-08-04 01:42:34 +0000 |
| commit | f99e72fa51d1a0de26dff3878832c9e2ed3f4f12 (patch) | |
| tree | 217e9f7cc781fc0827ea73ee64bdec3222902af2 | |
| parent | 6c77d7d73b552a489fa262fbca926d6fadfa3fc8 (diff) | |
| download | postgresql-f99e72fa51d1a0de26dff3878832c9e2ed3f4f12.tar.gz postgresql-f99e72fa51d1a0de26dff3878832c9e2ed3f4f12.zip | |
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.
| -rw-r--r-- | src/backend/access/transam/xlog.c | 7 |
1 files changed, 6 insertions, 1 deletions
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; |