From 1c68f2787767e4d59bb1986df1cbc33d30d1d31b Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Tue, 3 Apr 2001 18:05:53 +0000
Subject: [PATCH] Correct bogus mktime() calls.

---
 src/backend/utils/adt/datetime.c  | 4 +++-
 src/backend/utils/adt/timestamp.c | 4 +---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c
index 8691fa49b9..60346efdcd 100644
--- a/src/backend/utils/adt/datetime.c
+++ b/src/backend/utils/adt/datetime.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.62 2001/03/22 03:59:50 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.63 2001/04/03 18:05:53 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1120,6 +1120,8 @@ DecodeTimeOnly(char **field, int *ftype, int nf,
 		tmp->tm_sec = tm->tm_sec;
 
 #if defined(HAVE_TM_ZONE) || defined(HAVE_INT_TIMEZONE)
+		tmp->tm_year -= 1900;
+		tmp->tm_mon -= 1;
 		tmp->tm_isdst = -1;
 		mktime(tmp);
 		tm->tm_isdst = tmp->tm_isdst;
diff --git a/src/backend/utils/adt/timestamp.c b/src/backend/utils/adt/timestamp.c
index 7a2e6ea8bb..f4c90dc372 100644
--- a/src/backend/utils/adt/timestamp.c
+++ b/src/backend/utils/adt/timestamp.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/timestamp.c,v 1.46 2001/03/22 03:59:54 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/timestamp.c,v 1.47 2001/04/03 18:05:53 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1085,7 +1085,6 @@ timestamp_pl_span(PG_FUNCTION_ARGS)
 				if (IS_VALID_UTIME(tm->tm_year, tm->tm_mon, tm->tm_mday))
 				{
 #if defined(HAVE_TM_ZONE) || defined(HAVE_INT_TIMEZONE)
-					tm->tm_isdst = -1;
 					tm->tm_year -= 1900;
 					tm->tm_mon -= 1;
 					tm->tm_isdst = -1;
@@ -1727,7 +1726,6 @@ timestamp_trunc(PG_FUNCTION_ARGS)
 			if (IS_VALID_UTIME(tm->tm_year, tm->tm_mon, tm->tm_mday))
 			{
 #if defined(HAVE_TM_ZONE) || defined(HAVE_INT_TIMEZONE)
-				tm->tm_isdst = -1;
 				tm->tm_year -= 1900;
 				tm->tm_mon -= 1;
 				tm->tm_isdst = -1;