Commit 27bdb0c4 authored by Tom Lane's avatar Tom Lane

Code for SET/SHOW TIME ZONE with a fixed-interval timezone was not

prepared for HAVE_INT64_TIMESTAMP.  Per report from Guillaume Beaudoin.
parent 82468b42
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/commands/variable.c,v 1.106 2005/04/19 03:13:58 momjian Exp $ * $PostgreSQL: pgsql/src/backend/commands/variable.c,v 1.107 2005/06/05 01:48:34 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -284,7 +284,11 @@ assign_timezone(const char *value, bool doit, GucSource source) ...@@ -284,7 +284,11 @@ assign_timezone(const char *value, bool doit, GucSource source)
if (doit) if (doit)
{ {
/* Here we change from SQL to Unix sign convention */ /* Here we change from SQL to Unix sign convention */
#ifdef HAVE_INT64_TIMESTAMP
CTimeZone = -(interval->time / USECS_PER_SEC);
#else
CTimeZone = -interval->time; CTimeZone = -interval->time;
#endif
HasCTZSet = true; HasCTZSet = true;
} }
...@@ -398,8 +402,12 @@ show_timezone(void) ...@@ -398,8 +402,12 @@ show_timezone(void)
{ {
Interval interval; Interval interval;
interval. month = 0; interval.month = 0;
interval. time = -CTimeZone; #ifdef HAVE_INT64_TIMESTAMP
interval.time = -(CTimeZone * USECS_PER_SEC);
#else
interval.time = -CTimeZone;
#endif
tzn = DatumGetCString(DirectFunctionCall1(interval_out, tzn = DatumGetCString(DirectFunctionCall1(interval_out,
IntervalPGetDatum(&interval))); IntervalPGetDatum(&interval)));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment