summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.com>2018-11-07 14:42:36 +0400
committerAlexander Barkov <bar@mariadb.com>2018-11-07 14:42:36 +0400
commita5e2a14ef360a04242ec78864358f5d7eccdd741 (patch)
treec01bbbb14ddde5034f869584500592f6ce8f1d24 /mysql-test
parent41e68e8e5b3ce89c61f19bf072b59cf13a6fdc16 (diff)
downloadmariadb-git-a5e2a14ef360a04242ec78864358f5d7eccdd741.tar.gz
MDEV-17634 Regression: TIME(0)=TIME('z') returns NULL vs 1
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/main/type_time.result23
-rw-r--r--mysql-test/main/type_time.test12
2 files changed, 35 insertions, 0 deletions
diff --git a/mysql-test/main/type_time.result b/mysql-test/main/type_time.result
index 8a4f977d2d9..e530298db23 100644
--- a/mysql-test/main/type_time.result
+++ b/mysql-test/main/type_time.result
@@ -2094,5 +2094,28 @@ SELECT TIME(99991231235957), TIME(99991231235958), TIME(99991231235959);
TIME(99991231235957) TIME(99991231235958) TIME(99991231235959)
23:59:57 23:59:58 23:59:59
#
+# MDEV-17634 Regression: TIME(0)=TIME('z') returns NULL vs 1
+#
+SELECT
+TIMESTAMP(0)=TIMESTAMP('z') AS ts,
+DATE(0)=DATE('z') AS d,
+TIME(0)=TIME('z') AS t;
+ts d t
+1 1 1
+Warnings:
+Warning 1292 Incorrect datetime value: 'z'
+Warning 1292 Incorrect datetime value: 'z'
+Warning 1292 Truncated incorrect time value: 'z'
+SELECT
+TIMESTAMP(0)=TIMESTAMP('') AS ts,
+DATE(0)=DATE('') AS d,
+TIME(0)=TIME('') AS t;
+ts d t
+1 1 1
+Warnings:
+Warning 1292 Incorrect datetime value: ''
+Warning 1292 Incorrect datetime value: ''
+Warning 1292 Truncated incorrect time value: ''
+#
# End of 10.4 tests
#
diff --git a/mysql-test/main/type_time.test b/mysql-test/main/type_time.test
index f57773de2ef..1fe3d8ab0ee 100644
--- a/mysql-test/main/type_time.test
+++ b/mysql-test/main/type_time.test
@@ -1366,6 +1366,18 @@ SET optimizer_use_condition_selectivity=DEFAULT;
--echo #
SELECT TIME(99991231235957), TIME(99991231235958), TIME(99991231235959);
+--echo #
+--echo # MDEV-17634 Regression: TIME(0)=TIME('z') returns NULL vs 1
+--echo #
+SELECT
+ TIMESTAMP(0)=TIMESTAMP('z') AS ts,
+ DATE(0)=DATE('z') AS d,
+ TIME(0)=TIME('z') AS t;
+
+SELECT
+ TIMESTAMP(0)=TIMESTAMP('') AS ts,
+ DATE(0)=DATE('') AS d,
+ TIME(0)=TIME('') AS t;
--echo #
--echo # End of 10.4 tests