diff options
| author | unknown <gvb@phoenix.(none)> | 2006-01-23 11:18:06 +0100 |
|---|---|---|
| committer | unknown <gvb@phoenix.(none)> | 2006-01-23 11:18:06 +0100 |
| commit | c56ae50732e600e0a96c2a083005ff5a53e510a3 (patch) | |
| tree | e282d0c211c761b877c5f3f57346f9c5c8adaa09 /mysql-test | |
| parent | ffe11393c9ce64a064faa2b85d3fb78de9adc013 (diff) | |
| parent | e5f077f79a7872147a8858d353060ee08ffa5dcd (diff) | |
| download | mariadb-git-c56ae50732e600e0a96c2a083005ff5a53e510a3.tar.gz | |
Merge gboehn@bk-internal.mysql.com:/home/bk/mysql-4.1
into phoenix.(none):/data/mysql-4.1-BK
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/date_formats.result | 9 | ||||
| -rw-r--r-- | mysql-test/t/date_formats.test | 7 |
2 files changed, 16 insertions, 0 deletions
diff --git a/mysql-test/r/date_formats.result b/mysql-test/r/date_formats.result index 34a2dedd976..014eeed27e7 100644 --- a/mysql-test/r/date_formats.result +++ b/mysql-test/r/date_formats.result @@ -464,3 +464,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 diff --git a/mysql-test/t/date_formats.test b/mysql-test/t/date_formats.test index 6d501865d2c..78b4482a94a 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 ); +select str_to_date( 1, IF(1=1,NULL,NULL) ); # End of 4.1 tests |