summaryrefslogtreecommitdiff
path: root/mysql-test/r/func_time.result
diff options
context:
space:
mode:
authorAlexander Nozdrin <alexander.nozdrin@oracle.com>2010-11-25 14:33:11 +0300
committerAlexander Nozdrin <alexander.nozdrin@oracle.com>2010-11-25 14:33:11 +0300
commitb07b8de14fec04aaf5ba49869623d5c8e56ca91d (patch)
tree91aa6f910c027e9cdcc364081e0fa72d6ab6ceab /mysql-test/r/func_time.result
parentd71390449c9f2a3b0589804cd876d5f3172d4c90 (diff)
parent07fd5d6f993992f04074c6d16e08cdf42d22cc97 (diff)
downloadmariadb-git-b07b8de14fec04aaf5ba49869623d5c8e56ca91d.tar.gz
Auto-merge from mysql-5.5.7-rc-release.
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 0ed46ba270b..34987530b5a 100644
--- a/mysql-test/r/func_time.result
+++ b/mysql-test/r/func_time.result
@@ -1341,3 +1341,12 @@ SELECT * FROM t1 WHERE date_date <= addtime(date_add("2000-1-1", INTERVAL "1:1:1
date_date
DROP TABLE t1;
#
+# Bug#57512 str_to_date crash...
+#
+SELECT WEEK(STR_TO_DATE(NULL,0));
+WEEK(STR_TO_DATE(NULL,0))
+NULL
+SELECT SUBDATE(STR_TO_DATE(NULL,0), INTERVAL 1 HOUR);
+SUBDATE(STR_TO_DATE(NULL,0), INTERVAL 1 HOUR)
+NULL
+#