bk commit into 5.1 tree (ramil:1.2400)

[ramil]

Below is the list of changes that have just been committed into a local
5.1 repository of ram. When ram 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-29 10:59:52+04:00, ramil@stripped +3 -0
  Merge rkalimullin@stripped:/home/bk/mysql-5.1-maint
  into  mysql.com:/usr/home/ram/work/bug22229/my51-bug22229
  MERGE: 1.2273.166.1

  mysql-test/r/func_time.result@stripped, 2006-11-29 10:59:17+04:00, ramil@stripped +0 -0
    Auto merged
    MERGE: 1.80.2.1

  mysql-test/t/func_time.test@stripped, 2006-11-29 10:59:17+04:00, ramil@stripped +0 -0
    Auto merged
    MERGE: 1.65.1.2

  sql/item_timefunc.cc@stripped, 2006-11-29 10:59:17+04:00, ramil@stripped +0 -0
    Auto merged
    MERGE: 1.136.1.3

# 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:	ramil
# Host:	myoffice.izhnet.ru
# Root:	/usr/home/ram/work/bug22229/my51-bug22229/RESYNC

--- 1.147/sql/item_timefunc.cc	2006-11-29 11:00:30 +04:00
+++ 1.148/sql/item_timefunc.cc	2006-11-29 11:00:30 +04:00
@@ -3208,7 +3208,9 @@ bool Item_func_str_to_date::get_date(TIM
   date_time_format.format.str=    (char*) format->ptr();
   date_time_format.format.length= format->length();
   if (extract_date_time(&date_time_format, val->ptr(), val->length(),
-			ltime, cached_timestamp_type, 0, "datetime"))
+			ltime, cached_timestamp_type, 0, "datetime") ||
+      ((fuzzy_date & TIME_NO_ZERO_DATE) &&
+       (ltime->year == 0 || ltime->month == 0 || ltime->day == 0)))
     goto null_date;
   if (cached_timestamp_type == MYSQL_TIMESTAMP_TIME && ltime->day)
   {

--- 1.90/mysql-test/r/func_time.result	2006-11-29 11:00:31 +04:00
+++ 1.91/mysql-test/r/func_time.result	2006-11-29 11:00:31 +04:00
@@ -1180,6 +1180,9 @@ id	day	id	day
 3	2005-07-01	3	2005-07-15
 DROP TABLE t1,t2;
 set time_zone= @@global.time_zone;
+select str_to_date('10:00 PM', '%h:%i %p') + INTERVAL 10 MINUTE;
+str_to_date('10:00 PM', '%h:%i %p') + INTERVAL 10 MINUTE
+NULL
 End of 5.0 tests
 select date_sub("0050-01-01 00:00:01",INTERVAL 2 SECOND);
 date_sub("0050-01-01 00:00:01",INTERVAL 2 SECOND)

--- 1.75/mysql-test/t/func_time.test	2006-11-29 11:00:31 +04:00
+++ 1.76/mysql-test/t/func_time.test	2006-11-29 11:00:31 +04:00
@@ -686,6 +686,12 @@ DROP TABLE t1,t2;
 
 # Restore timezone to default
 set time_zone= @@global.time_zone;
+
+#
+# Bug #22229: bug in DATE_ADD()
+#
+
+select str_to_date('10:00 PM', '%h:%i %p') + INTERVAL 10 MINUTE;
 --echo End of 5.0 tests
 
 #