From 4df0f1d26f62e835bb357fa7c2e3d5de5fcbf802 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Thu, 20 Feb 2003 05:24:55 +0000 Subject: Fix timestamptz_in so that parsing of 'now'::timestamptz gives right answer when SET TIMEZONE has been done since the start of the current transaction. Per bug report from Robert Haas. I plan some futher cleanup in HEAD, but this is a low-risk patch for the immediate issue in 7.3. --- src/backend/utils/adt/nabstime.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/backend/utils/adt/nabstime.c') diff --git a/src/backend/utils/adt/nabstime.c b/src/backend/utils/adt/nabstime.c index 853cd014852..e6fa5a21fc0 100644 --- a/src/backend/utils/adt/nabstime.c +++ b/src/backend/utils/adt/nabstime.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.102 2002/12/12 19:16:55 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.103 2003/02/20 05:24:55 tgl Exp $ * * NOTES * @@ -243,25 +243,24 @@ GetCurrentDateTime(struct tm * tm) int tz; abstime2tm(GetCurrentTransactionStartTime(), &tz, tm, NULL); - - return; } /* GetCurrentDateTime() */ void -GetCurrentTimeUsec(struct tm * tm, fsec_t *fsec) +GetCurrentTimeUsec(struct tm * tm, fsec_t *fsec, int *tzp) { int tz; int usec; abstime2tm(GetCurrentTransactionStartTimeUsec(&usec), &tz, tm, NULL); + /* Note: don't pass NULL tzp directly to abstime2tm */ + if (tzp != NULL) + *tzp = tz; #ifdef HAVE_INT64_TIMESTAMP *fsec = usec; #else *fsec = usec * 1.0e-6; #endif - - return; } /* GetCurrentTimeUsec() */ -- cgit v1.2.3