diff options
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/commands/variable.c | 2 | ||||
| -rw-r--r-- | src/backend/utils/adt/datetime.c | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/backend/commands/variable.c b/src/backend/commands/variable.c index e647ac05ff5..b6af6e7e253 100644 --- a/src/backend/commands/variable.c +++ b/src/backend/commands/variable.c @@ -327,6 +327,7 @@ check_timezone(char **newval, void **extra, GucSource source) #else myextra.CTimeZone = -interval->time; #endif + myextra.session_timezone = pg_tzset_offset(myextra.CTimeZone); myextra.HasCTZSet = true; pfree(interval); @@ -341,6 +342,7 @@ check_timezone(char **newval, void **extra, GucSource source) { /* Here we change from SQL to Unix sign convention */ myextra.CTimeZone = -hours * SECS_PER_HOUR; + myextra.session_timezone = pg_tzset_offset(myextra.CTimeZone); myextra.HasCTZSet = true; } else diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c index 7a08b9279d9..7834c932510 100644 --- a/src/backend/utils/adt/datetime.c +++ b/src/backend/utils/adt/datetime.c @@ -1455,12 +1455,6 @@ DetermineTimeZoneOffset(struct pg_tm * tm, pg_tz *tzp) after_isdst; int res; - if (tzp == session_timezone && HasCTZSet) - { - tm->tm_isdst = 0; /* for lack of a better idea */ - return CTimeZone; - } - /* * First, generate the pg_time_t value corresponding to the given * y/m/d/h/m/s taken as GMT time. If this overflows, punt and decide the |