diff options
author | Sergey Glukhov <sergey.glukhov@oracle.com> | 2011-07-27 12:51:55 +0400 |
---|---|---|
committer | Sergey Glukhov <sergey.glukhov@oracle.com> | 2011-07-27 12:51:55 +0400 |
commit | 14ea4af7eb799e9a9c2b90a40173b7b3191a8ccb (patch) | |
tree | 6399fea05095924720aa1bf88d1f2cfe8172158c /mysql-test/r/func_time.result | |
parent | 111570dfd6e1d0abc062f63045b371074ac2b630 (diff) | |
parent | 3050742dd9c81e5e18b64343dc7d3ea67650e050 (diff) | |
download | mariadb-git-14ea4af7eb799e9a9c2b90a40173b7b3191a8ccb.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 | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/r/func_time.result b/mysql-test/r/func_time.result index e6ef9bdfe61..bad467b3255 100644 --- a/mysql-test/r/func_time.result +++ b/mysql-test/r/func_time.result @@ -1398,6 +1398,12 @@ NULL SELECT WEEK(DATE_ADD(FROM_DAYS(1),INTERVAL 1 MONTH), 1); WEEK(DATE_ADD(FROM_DAYS(1),INTERVAL 1 MONTH), 1) NULL +# +# Bug#12584302 AFTER FIX FOR #12403504: ASSERTION FAILED: DELSUM+(INT) Y/4-TEMP > 0, +# +DO WEEK((DATE_ADD((CAST(0 AS DATE)), INTERVAL 1 YEAR_MONTH)), 5); +Warnings: +Warning 1292 Incorrect datetime value: '0' End of 5.1 tests # # Bug#57039: constant subtime expression returns incorrect result. |