bk commit into 4.1 tree (bar:1.2553)

[bar]

Below is the list of changes that have just been committed into a local
4.1 repository of bar. When bar does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-11-20 18:08:46+04:00, bar@stripped +1 -0
  Merge mysql.com:/usr/home/bar/mysql-4.1.b22646
  into  mysql.com:/usr/home/bar/mysql-4.1-rpl
  MERGE: 1.2544.1.1

  sql/item_timefunc.cc@stripped, 2006-11-20 18:08:42+04:00, bar@stripped +0 -0
    Auto merged
    MERGE: 1.110.1.1

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	bar
# Host:	bar.intranet.mysql.r18.ru
# Root:	/usr/home/bar/mysql-4.1-rpl/RESYNC

--- 1.111/sql/item_timefunc.cc	2006-11-20 18:08:51 +04:00
+++ 1.112/sql/item_timefunc.cc	2006-11-20 18:08:51 +04:00
@@ -1920,15 +1920,10 @@ bool Item_func_convert_tz::get_date(TIME
     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_time_tmp= from_tz->TIME_to_gmt_sec(ltime, &not_used);
-    if (my_time_tmp >= TIMESTAMP_MIN_VALUE && my_time_tmp <=
TIMESTAMP_MAX_VALUE)
-      to_tz->gmt_sec_to_TIME(ltime, my_time_tmp);
-  }
+  my_time_tmp= from_tz->TIME_to_gmt_sec(ltime, &not_used);
+  /* 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;