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 | d25eaabe8e9ec19a0e323bff61c32036b121d9cc (patch) | |
| tree | 11d8a877f4be74ba07d333ecebf4f60c70d05b77 /mysql-test/t/date_formats.test | |
| parent | 9b3e6c27b0615270042cff92c88cb338ded9b69f (diff) | |
| parent | e5f077f79a7872147a8858d353060ee08ffa5dcd (diff) | |
| download | mariadb-git-d25eaabe8e9ec19a0e323bff61c32036b121d9cc.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/t/date_formats.test')
| -rw-r--r-- | mysql-test/t/date_formats.test | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/mysql-test/t/date_formats.test b/mysql-test/t/date_formats.test index c007c2f5205..b4c6cf0d72a 100644 --- a/mysql-test/t/date_formats.test +++ b/mysql-test/t/date_formats.test @@ -269,4 +269,11 @@ insert into t1 (f1) values ("2005-01-01"); 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 |