mirror of
https://github.com/postgres/postgres.git
synced 2025-05-28 05:21:27 +03:00
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.
This commit is contained in:
parent
6c77d7d73b
commit
f99e72fa51
@ -7,7 +7,7 @@
|
|||||||
* Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
|
* Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
|
||||||
* Portions Copyright (c) 1994, Regents of the University of California
|
* 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];
|
static char buf[128];
|
||||||
|
|
||||||
strftime(buf, sizeof(buf),
|
strftime(buf, sizeof(buf),
|
||||||
|
/* Win32 timezone names are too long so don't print them */
|
||||||
|
#ifndef WIN32
|
||||||
"%Y-%m-%d %H:%M:%S %Z",
|
"%Y-%m-%d %H:%M:%S %Z",
|
||||||
|
#else
|
||||||
|
"%Y-%m-%d %H:%M:%S",
|
||||||
|
#endif
|
||||||
localtime(&tnow));
|
localtime(&tnow));
|
||||||
|
|
||||||
return buf;
|
return buf;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user