bk commit into 5.0 tree (ramil:1.2295)

[ramil]

Below is the list of changes that have just been committed into a local
5.0 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-16 15:26:33+04:00, ramil@stripped +3 -0
  Merge mysql.com:/usr/home/ram/work/bug23653/my41-bug23653
  into  mysql.com:/usr/home/ram/work/bug23653/my50-bug23653
  MERGE: 1.1616.2144.203

  mysql-test/r/func_time.result@stripped, 2006-11-16 15:26:28+04:00, ramil@stripped +0 -0
    Auto merged
    MERGE: 1.23.6.5

  mysql-test/t/func_time.test@stripped, 2006-11-16 15:26:29+04:00, ramil@stripped +0 -0
    Auto merged
    MERGE: 1.21.5.5

  sql/item_timefunc.cc@stripped, 2006-11-16 15:26:29+04:00, ramil@stripped +0 -0
    Auto merged
    MERGE: 1.51.6.6

# 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/bug23653/my50-bug23653/RESYNC

--- 1.130/sql/item_timefunc.cc	2006-11-16 15:26:40 +04:00
+++ 1.131/sql/item_timefunc.cc	2006-11-16 15:26:40 +04:00
@@ -3369,7 +3369,8 @@ String *Item_func_str_to_date::val_str(S
 
 bool Item_func_last_day::get_date(TIME *ltime, uint fuzzy_date)
 {
-  if (get_arg0_date(ltime, fuzzy_date & ~TIME_FUZZY_DATE))
+  if (get_arg0_date(ltime, fuzzy_date & ~TIME_FUZZY_DATE) ||
+      (ltime->month == 0))
     return 1;
   uint month_idx= ltime->month-1;
   ltime->day= days_in_month[month_idx];

--- 1.74/mysql-test/r/func_time.result	2006-11-16 15:26:40 +04:00
+++ 1.75/mysql-test/r/func_time.result	2006-11-16 15:26:40 +04:00
@@ -1047,6 +1047,9 @@ union
 (select time_format(timediff(now(), DATE_SUB(now(),INTERVAL 5 HOUR)),'%k') As H);
 H
 5
+select last_day('0000-00-00');
+last_day('0000-00-00')
+NULL
 End of 4.1 tests
 explain extended select timestampdiff(SQL_TSI_WEEK, '2001-02-01', '2001-05-01') as a1,
 timestampdiff(SQL_TSI_FRAC_SECOND, '2001-02-01 12:59:59.120000', '2001-05-01
12:58:58.119999') as a2;

--- 1.61/mysql-test/t/func_time.test	2006-11-16 15:26:40 +04:00
+++ 1.62/mysql-test/t/func_time.test	2006-11-16 15:26:40 +04:00
@@ -564,6 +564,12 @@ union
 union
 (select time_format(timediff(now(), DATE_SUB(now(),INTERVAL 5 HOUR)),'%k') As H);
 
+#
+# Bug #23653: crash if last_day('0000-00-00')
+#
+
+select last_day('0000-00-00');
+
 --echo End of 4.1 tests
 
 explain extended select timestampdiff(SQL_TSI_WEEK, '2001-02-01', '2001-05-01') as a1,