diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2005-06-05 01:48:34 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2005-06-05 01:48:34 +0000 |
| commit | 27bdb0c40d1319d82af2b21e10b1e69aef763b82 (patch) | |
| tree | 4db06e676defe2b9c0109db137fb4100911c0c52 /src/backend/commands/variable.c | |
| parent | 82468b428b8ee7599255cbeee883e62d111eb7a3 (diff) | |
| download | postgresql-27bdb0c40d1319d82af2b21e10b1e69aef763b82.tar.gz postgresql-27bdb0c40d1319d82af2b21e10b1e69aef763b82.zip | |
Code for SET/SHOW TIME ZONE with a fixed-interval timezone was not
prepared for HAVE_INT64_TIMESTAMP. Per report from Guillaume Beaudoin.
Diffstat (limited to 'src/backend/commands/variable.c')
| -rw-r--r-- | src/backend/commands/variable.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/backend/commands/variable.c b/src/backend/commands/variable.c index e7762040626..3388f314fe3 100644 --- a/src/backend/commands/variable.c +++ b/src/backend/commands/variable.c @@ -9,7 +9,7 @@ * * * 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) if (doit) { /* Here we change from SQL to Unix sign convention */ +#ifdef HAVE_INT64_TIMESTAMP + CTimeZone = -(interval->time / USECS_PER_SEC); +#else CTimeZone = -interval->time; +#endif HasCTZSet = true; } @@ -398,8 +402,12 @@ show_timezone(void) { Interval interval; - interval. month = 0; - interval. time = -CTimeZone; + interval.month = 0; +#ifdef HAVE_INT64_TIMESTAMP + interval.time = -(CTimeZone * USECS_PER_SEC); +#else + interval.time = -CTimeZone; +#endif tzn = DatumGetCString(DirectFunctionCall1(interval_out, IntervalPGetDatum(&interval))); |