summaryrefslogtreecommitdiff
path: root/mysql-test/r/func_time.result
diff options
context:
space:
mode:
authorSergey Glukhov <sergey.glukhov@oracle.com>2011-05-18 10:59:04 +0400
committerSergey Glukhov <sergey.glukhov@oracle.com>2011-05-18 10:59:04 +0400
commita48bff1d90ca132afeed0eef4a24221070ee965a (patch)
tree2181c7af64b220c88221880c51a49088d7569976 /mysql-test/r/func_time.result
parentb1ad5f2e04651be71dc6d835f8ab671a9183ed62 (diff)
parenta7cd008e12875d21d37ae92ccbef50d87d4fbd35 (diff)
downloadmariadb-git-a48bff1d90ca132afeed0eef4a24221070ee965a.tar.gz
5.1 -> 5.5 merge
Diffstat (limited to 'mysql-test/r/func_time.result')
-rw-r--r--mysql-test/r/func_time.result9
1 files changed, 9 insertions, 0 deletions
diff --git a/mysql-test/r/func_time.result b/mysql-test/r/func_time.result
index b1bf0a6a830..e6ef9bdfe61 100644
--- a/mysql-test/r/func_time.result
+++ b/mysql-test/r/func_time.result
@@ -1389,6 +1389,15 @@ NULL
SELECT DATE_FORMAT('0000-00-11', '%w');
DATE_FORMAT('0000-00-11', '%w')
NULL
+#
+# Bug#12403504 AFTER FIX FOR #11889186 : ASSERTION FAILED: DELSUM+(INT) Y/4-TEMP > 0
+#
+SELECT MAKEDATE(11111111,1);
+MAKEDATE(11111111,1)
+NULL
+SELECT WEEK(DATE_ADD(FROM_DAYS(1),INTERVAL 1 MONTH), 1);
+WEEK(DATE_ADD(FROM_DAYS(1),INTERVAL 1 MONTH), 1)
+NULL
End of 5.1 tests
#
# Bug#57039: constant subtime expression returns incorrect result.