diff options
author | unknown <gvb@phoenix.(none)> | 2006-01-13 14:42:46 +0100 |
---|---|---|
committer | unknown <gvb@phoenix.(none)> | 2006-01-13 14:42:46 +0100 |
commit | 25e32d83d6d5fdce25ba4ef68885ffbf9f7a934f (patch) | |
tree | 04b9dbe5cbab5fb0d91d20b33250df79b8ea3d9d /mysql-test/t/date_formats.test | |
parent | 4e195cbd520d30260e226af9e27cb937335ca1f1 (diff) | |
download | mariadb-git-25e32d83d6d5fdce25ba4ef68885ffbf9f7a934f.tar.gz |
fix for bug#15828
problem was not checking 2nd parameter of str_to_date against NULL
mysql-test/r/date_formats.result:
bk commit
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 6d501865d2c..dd31f1509c0 100644 --- a/mysql-test/t/date_formats.test +++ b/mysql-test/t/date_formats.test @@ -268,4 +268,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 ); + # End of 4.1 tests |