summaryrefslogtreecommitdiff
path: root/mysql-test/main/type_datetime.test
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-08-29 08:41:53 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2019-08-29 12:00:12 +0300
commit1a3c36595320bd4cf94ba5ab6c5127129269af67 (patch)
tree72954842785e24025db2b2638940251993142989 /mysql-test/main/type_datetime.test
parente41eb044f19e3ee9b881344565924dd6b9d20e1a (diff)
parent5e9b34191e395ced03fbbbe6aedc07b0a7293984 (diff)
downloadmariadb-git-1a3c36595320bd4cf94ba5ab6c5127129269af67.tar.gz
Merge 10.2 into 10.3
Diffstat (limited to 'mysql-test/main/type_datetime.test')
-rw-r--r--mysql-test/main/type_datetime.test23
1 files changed, 23 insertions, 0 deletions
diff --git a/mysql-test/main/type_datetime.test b/mysql-test/main/type_datetime.test
index baf85187099..2445925cb80 100644
--- a/mysql-test/main/type_datetime.test
+++ b/mysql-test/main/type_datetime.test
@@ -725,6 +725,29 @@ SET SQL_MODE=DEFAULT;
--echo #
+--echo # MDEV-19699 Server crashes in Item_null_result::field_type upon SELECT with ROLLUP on constant table
+--echo #
+
+CREATE TABLE t1 (d DATETIME) ENGINE=MyISAM;
+INSERT INTO t1 VALUES ('1999-11-04');
+SELECT d FROM t1 GROUP BY d WITH ROLLUP HAVING d > '1990-01-01';
+DROP TABLE t1;
+
+
+--echo #
+--echo # MDEV-20431 GREATEST(int_col,date_col) returns wrong results in a view
+--echo #
+
+CREATE TABLE t1 (pk INT NOT NULL, d DATETIME NOT NULL);
+CREATE VIEW v1 AS SELECT * FROM t1;
+INSERT INTO t1 VALUES (1,'2018-06-22 00:00:00'),(2,'2018-07-11 00:00:00');
+SELECT GREATEST(pk, d) FROM t1;
+SELECT GREATEST(pk, d) FROM v1;
+DROP VIEW v1;
+DROP TABLE t1;
+
+
+--echo #
--echo # End of 10.1 tests
--echo #