diff options
author | unknown <tnurnberg@mysql.com> | 2006-05-11 12:48:49 +0200 |
---|---|---|
committer | unknown <tnurnberg@mysql.com> | 2006-05-11 12:48:49 +0200 |
commit | ec83dd7c61f4e29122ecff278ca81b03bd51b271 (patch) | |
tree | 5985f0f4e626b36c146553994284dd46d57cd8b7 /mysql-test/r | |
parent | dd934da9159a6eb69fdd7fdd91a78c801a0b7caa (diff) | |
parent | bc1815aa3d8a700f28a139a63fdbee684e482f0d (diff) | |
download | mariadb-git-ec83dd7c61f4e29122ecff278ca81b03bd51b271.tar.gz |
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql-4.1-10418
Diffstat (limited to 'mysql-test/r')
-rw-r--r-- | mysql-test/r/func_time.result | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/r/func_time.result b/mysql-test/r/func_time.result index fc872285acb..02f3d2f7273 100644 --- a/mysql-test/r/func_time.result +++ b/mysql-test/r/func_time.result @@ -626,3 +626,7 @@ last_day('2005-01-00') NULL Warnings: Warning 1292 Truncated incorrect datetime value: '2005-01-00' +select monthname(str_to_date(null, '%m')), monthname(str_to_date(null, '%m')), +monthname(str_to_date(1, '%m')), monthname(str_to_date(0, '%m')); +monthname(str_to_date(null, '%m')) monthname(str_to_date(null, '%m')) monthname(str_to_date(1, '%m')) monthname(str_to_date(0, '%m')) +NULL NULL January NULL |