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/r/date_formats.result | |
| 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/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 434a5df1e17..214c9466c8c 100644 --- a/mysql-test/r/date_formats.result +++ b/mysql-test/r/date_formats.result @@ -506,3 +506,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 |