bk commit into 5.0 tree (gunnar:1.2028)

[Gunnar von Boehn]

Below is the list of changes that have just been committed into a local
5.0 repository of gvb. When gvb 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
  1.2028 06/02/02 19:10:27 gunnar@stripped. +3 -0
  Merge mysql.com.:/data/BK/mysql-4.1_15828
  into  mysql.com.:/data/BK/mysql-5.0_15828

  sql/item_timefunc.cc
    1.101 06/02/02 19:10:18 gunnar@stripped. +0 -2
    manually merging fix for bug 15282 - automerge failed as 5.0 was heavely changed
    step one using local for file item_timefunc 

  mysql-test/t/date_formats.test
    1.15 06/02/02 19:07:27 gunnar@stripped. +0 -0
    Auto merged

  mysql-test/r/date_formats.result
    1.19 06/02/02 19:07:27 gunnar@stripped. +0 -0
    Auto merged

# 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:	gunnar
# Host:	titan.
# Root:	/data/BK/mysql-5.0_15828/RESYNC

--- 1.18/mysql-test/r/date_formats.result	2005-10-27 19:04:31 +02:00
+++ 1.19/mysql-test/r/date_formats.result	2006-02-02 19:07:27 +01:00
@@ -503,3 +503,12 @@
 02	February
 01	January
 drop table t1;
+select str_to_date( 1, NULL );
+str_to_date( 1, NULL )
+NULL
+select str_to_date( NULL, 1 );
+str_to_date( NULL, 1 )
+NULL
+select str_to_date( 1, IF(1=1,NULL,NULL) );
+str_to_date( 1, IF(1=1,NULL,NULL) )
+NULL

--- 1.14/mysql-test/t/date_formats.test	2005-10-27 19:04:32 +02:00
+++ 1.15/mysql-test/t/date_formats.test	2006-02-02 19:07:27 +01:00
@@ -269,4 +269,11 @@
 insert into t1 (f1) values ("2005-02-01");
 select date_format(f1, "%m") as d1, date_format(f1, "%M") as d2 from t1 order by
date_format(f1, "%M");
 drop table t1;
+
+#
+# Bug #15828
+#
+select str_to_date( 1, NULL );
+select str_to_date( NULL, 1 );
+select str_to_date( 1, IF(1=1,NULL,NULL) );
 # End of 4.1 tests