diff options
| author | unknown <konstantin@mysql.com> | 2006-02-08 14:05:19 +0300 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2006-02-08 14:05:19 +0300 |
| commit | fa86430f2870c7609bb659598ce269aeefa288fa (patch) | |
| tree | 30aac0d473473490e476729fb311b3b1d9c36e52 /mysql-test/t/date_formats.test | |
| parent | 28c8134cf35daa44f7a18688096642218e7bc692 (diff) | |
| parent | 86f9bdf8b2e5ea624e3eff2962c531b8c3c6e3c0 (diff) | |
| download | mariadb-git-fa86430f2870c7609bb659598ce269aeefa288fa.tar.gz | |
Merge mysql.com:/home/kostja/mysql/tmp_merge
into mysql.com:/home/kostja/mysql/mysql-5.1-merge
client/mysqltest.c:
Auto merged
mysql-test/r/date_formats.result:
Auto merged
mysql-test/r/sp-error.result:
Auto merged
mysql-test/r/sp-security.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/r/type_float.result:
Auto merged
mysql-test/t/date_formats.test:
Auto merged
mysql-test/t/sp-error.test:
Auto merged
mysql-test/t/sp-security.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysql-test/t/type_float.test:
Auto merged
mysql-test/t/variables.test:
Auto merged
sql/item_timefunc.cc:
Auto merged
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 88106ae6956..2e1af51efa7 100644 --- a/mysql-test/t/date_formats.test +++ b/mysql-test/t/date_formats.test @@ -272,4 +272,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 |