Merge mysql.com:/home/cps/mysql/trees/4.1-runtime-bug9191

into  mysql.com:/home/cps/mysql/trees/5.0-runtime-bug9191


configure.in:
  Auto merged
include/my_time.h:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/timezone2.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/timezone2.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/time.cc:
  Auto merged
BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
  Auto merged
sql-common/my_time.c:
  manual merge
sql/item_timefunc.cc:
  manual merge
sql/tztime.cc:
  manual merge

1 files changed, 3 insertions, 6 deletions

diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc
index 48d6458bd88..4e655562c75 100644
--- a/sql/item_timefunc.cc
+++ b/sql/item_timefunc.cc
@@ -1930,17 +1930,14 @@ bool Item_func_convert_tz::get_date(TIME *ltime,
     return 1;
   }
 
-  /* Check if we in range where we treat datetime values as non-UTC */
-  if (ltime->year < TIMESTAMP_MAX_YEAR && ltime->year > TIMESTAMP_MIN_YEAR ||
-      ltime->year==TIMESTAMP_MAX_YEAR && ltime->month==1 && ltime->day==1 ||
-      ltime->year==TIMESTAMP_MIN_YEAR && ltime->month==12 && ltime->day==31)
   {
     my_bool not_used;
     my_time_tmp= from_tz->TIME_to_gmt_sec(ltime, &not_used);
-    if (my_time_tmp >= TIMESTAMP_MIN_VALUE && my_time_tmp <= TIMESTAMP_MAX_VALUE)
+    /* my_time_tmp is guranteed to be in the allowed range */
+    if (my_time_tmp)
       to_tz->gmt_sec_to_TIME(ltime, my_time_tmp);
   }
-  
+
   null_value= 0;
   return 0;
 }