diff options
| author | unknown <gunnar@mysql.com.> | 2006-02-02 19:10:27 +0100 |
|---|---|---|
| committer | unknown <gunnar@mysql.com.> | 2006-02-02 19:10:27 +0100 |
| commit | 933cfc31c9bc619973713597dae527c924845f37 (patch) | |
| tree | 11d8a877f4be74ba07d333ecebf4f60c70d05b77 /mysql-test/r/date_formats.result | |
| parent | 691bef65caf5dc85c0e7cc5ff1b917fabca8590d (diff) | |
| parent | c906c4ffd0b8f27c2b7f5ead30addd9d3879bdf0 (diff) | |
| download | mariadb-git-933cfc31c9bc619973713597dae527c924845f37.tar.gz | |
Merge mysql.com.:/data/BK/mysql-4.1_15828
into mysql.com.:/data/BK/mysql-5.0_15828
mysql-test/r/date_formats.result:
Auto merged
mysql-test/t/date_formats.test:
Auto merged
sql/item_timefunc.cc:
manually merging fix for bug 15282 - automerge failed as 5.0 was heavely changed
step one using local for file item_timefunc
Diffstat (limited to 'mysql-test/r/date_formats.result')
| -rw-r--r-- | mysql-test/r/date_formats.result | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/mysql-test/r/date_formats.result b/mysql-test/r/date_formats.result index f8189266e50..39e3aa0ca8e 100644 --- a/mysql-test/r/date_formats.result +++ b/mysql-test/r/date_formats.result @@ -503,3 +503,12 @@ d1 d2 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 |