diff options
| author | Sergey Glukhov <sergey.glukhov@oracle.com> | 2011-04-27 11:46:23 +0400 |
|---|---|---|
| committer | Sergey Glukhov <sergey.glukhov@oracle.com> | 2011-04-27 11:46:23 +0400 |
| commit | 75f02c36ce158b58d6e7da8b98ccd2e0b1426758 (patch) | |
| tree | 2a80f211f0c197a787a8029a6b7112f19828970e /mysql-test/r/func_time.result | |
| parent | b4c9402fabe17e4a3cf425a148faa24c470fb2dd (diff) | |
| parent | 735bab72c51e0ff4ccf5fb688826e87931ee8fe2 (diff) | |
| download | mariadb-git-75f02c36ce158b58d6e7da8b98ccd2e0b1426758.tar.gz | |
5.1 -> 5.5 merge
Diffstat (limited to 'mysql-test/r/func_time.result')
| -rw-r--r-- | mysql-test/r/func_time.result | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/mysql-test/r/func_time.result b/mysql-test/r/func_time.result index 43e37dab9d5..b1bf0a6a830 100644 --- a/mysql-test/r/func_time.result +++ b/mysql-test/r/func_time.result @@ -1377,6 +1377,18 @@ NULL SELECT ADDDATE(MONTH(FROM_UNIXTIME(NULL)),INTERVAL 1 HOUR); ADDDATE(MONTH(FROM_UNIXTIME(NULL)),INTERVAL 1 HOUR) NULL +# +# Bug#11889186 60503: CRASH IN MAKE_DATE_TIME WITH DATE_FORMAT / STR_TO_DATE COMBINATION +# +SELECT DATE_FORMAT('0000-00-11', '%W'); +DATE_FORMAT('0000-00-11', '%W') +NULL +SELECT DATE_FORMAT('0000-00-11', '%a'); +DATE_FORMAT('0000-00-11', '%a') +NULL +SELECT DATE_FORMAT('0000-00-11', '%w'); +DATE_FORMAT('0000-00-11', '%w') +NULL End of 5.1 tests # # Bug#57039: constant subtime expression returns incorrect result. |