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 | f6b68c7d82eb97f57e2f157e395d5b0f071c52c7 (patch) | |
| tree | 6399fea05095924720aa1bf88d1f2cfe8172158c /mysql-test | |
| parent | f2c7452f1cca15868989096bdbe88adef72132ef (diff) | |
| parent | 75eaa30d26b65e6da5ebe35728824a3603719599 (diff) | |
| download | mariadb-git-f6b68c7d82eb97f57e2f157e395d5b0f071c52c7.tar.gz | |
5.1 -> 5.5 merge
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/func_time.result | 6 | ||||
| -rw-r--r-- | mysql-test/t/func_time.test | 6 |
2 files changed, 12 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. diff --git a/mysql-test/t/func_time.test b/mysql-test/t/func_time.test index 86f465b3a6e..57a5a656591 100644 --- a/mysql-test/t/func_time.test +++ b/mysql-test/t/func_time.test @@ -909,6 +909,12 @@ SELECT DATE_FORMAT('0000-00-11', '%w'); SELECT MAKEDATE(11111111,1); SELECT WEEK(DATE_ADD(FROM_DAYS(1),INTERVAL 1 MONTH), 1); +--echo # +--echo # Bug#12584302 AFTER FIX FOR #12403504: ASSERTION FAILED: DELSUM+(INT) Y/4-TEMP > 0, +--echo # + +DO WEEK((DATE_ADD((CAST(0 AS DATE)), INTERVAL 1 YEAR_MONTH)), 5); + --echo End of 5.1 tests --echo # |