diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2005-06-05 01:48:45 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2005-06-05 01:48:45 +0000 |
| commit | 2f5b2558d31ec2ca7353ae32160a6885df3690bc (patch) | |
| tree | 7f1e74f9c28123fe11c5fa1de6b32e4bc0f1d9d3 | |
| parent | 272f23c814929f7e5cd90c361815bbfef036a831 (diff) | |
| download | postgresql-2f5b2558d31ec2ca7353ae32160a6885df3690bc.tar.gz postgresql-2f5b2558d31ec2ca7353ae32160a6885df3690bc.zip | |
Code for SET/SHOW TIME ZONE with a fixed-interval timezone was not
prepared for HAVE_INT64_TIMESTAMP. Per report from Guillaume Beaudoin.
| -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 7add658d6ab..a7c2731819d 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.105 2004/12/31 21:59:42 pgsql Exp $ + * $PostgreSQL: pgsql/src/backend/commands/variable.c,v 1.105.4.1 2005/06/05 01:48:45 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 / INT64CONST(1000000)); +#else CTimeZone = -interval->time; +#endif HasCTZSet = true; } @@ -452,8 +456,12 @@ show_timezone(void) { Interval interval; - interval. month = 0; - interval. time = -CTimeZone; + interval.month = 0; +#ifdef HAVE_INT64_TIMESTAMP + interval.time = -(CTimeZone * INT64CONST(1000000)); +#else + interval.time = -CTimeZone; +#endif tzn = DatumGetCString(DirectFunctionCall1(interval_out, IntervalPGetDatum(&interval))); |