summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mnogosearch.org>2014-10-03 15:07:53 +0400
committerAlexander Barkov <bar@mnogosearch.org>2014-10-03 15:07:53 +0400
commit68354ef272087d589f07ee8892301cd8b9ff6eba (patch)
tree8c2e4703cef47503fd44e9a847748c57050262af /mysql-test
parentb737d902a8f4b42e8e515d112aeeb6ebe5ffa91a (diff)
downloadmariadb-git-68354ef272087d589f07ee8892301cd8b9ff6eba.tar.gz
MDEV-6592 Assertion `ltime->day == 0' failed with TIMESTAMP, MAKETIME
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/type_time.result11
-rw-r--r--mysql-test/t/type_time.test11
2 files changed, 22 insertions, 0 deletions
diff --git a/mysql-test/r/type_time.result b/mysql-test/r/type_time.result
index ad2e857a8d3..07e59099e4b 100644
--- a/mysql-test/r/type_time.result
+++ b/mysql-test/r/type_time.result
@@ -352,3 +352,14 @@ SELECT '-24:00:00' = (SELECT f1 FROM t1);
'-24:00:00' = (SELECT f1 FROM t1)
1
DROP TABLE t1;
+#
+# MDEV-6592 Assertion `ltime->day == 0' failed with TIMESTAMP, MAKETIME
+#
+CREATE TABLE t1 (d DATE, c VARCHAR(10), KEY(d)) engine=myisam;
+INSERT INTO t1 VALUES ('2008-10-02','2008-10-02'), ('2008-10-02','2008-10-02');
+SELECT * FROM t1 WHERE TIMESTAMP(c,'02:04:42') AND d <=> MAKETIME(97,0,7);
+d c
+DROP TABLE t1;
+#
+# End of 5.5 tests
+#
diff --git a/mysql-test/t/type_time.test b/mysql-test/t/type_time.test
index 88840e9b679..259b1819d21 100644
--- a/mysql-test/t/type_time.test
+++ b/mysql-test/t/type_time.test
@@ -239,3 +239,14 @@ SELECT CAST('-24:00:00' AS TIME) = (SELECT f1 FROM t1);
SELECT '-24:00:00' = (SELECT f1 FROM t1);
DROP TABLE t1;
+--echo #
+--echo # MDEV-6592 Assertion `ltime->day == 0' failed with TIMESTAMP, MAKETIME
+--echo #
+CREATE TABLE t1 (d DATE, c VARCHAR(10), KEY(d)) engine=myisam;
+INSERT INTO t1 VALUES ('2008-10-02','2008-10-02'), ('2008-10-02','2008-10-02');
+SELECT * FROM t1 WHERE TIMESTAMP(c,'02:04:42') AND d <=> MAKETIME(97,0,7);
+DROP TABLE t1;
+
+--echo #
+--echo # End of 5.5 tests
+--echo #