diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-11-07 23:02:39 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-11-07 23:02:39 +0200 |
| commit | 843e4508c0aa9fe50f750523b64ff04f517a2dea (patch) | |
| tree | 06fa2a83f3e65f28832c46285236d3a5b8b568a1 /mysql-test/t | |
| parent | a4feb04ace2e7759aee4dd74b71cbb1151b1886f (diff) | |
| parent | 5691109689bc40fa303c1b7ddc84b9209ec5f869 (diff) | |
| download | mariadb-git-843e4508c0aa9fe50f750523b64ff04f517a2dea.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'mysql-test/t')
| -rw-r--r-- | mysql-test/t/delimiter_case_mdev_10728.sql | 3 | ||||
| -rw-r--r-- | mysql-test/t/delimiter_command_case_sensitivity.test | 2 | ||||
| -rw-r--r-- | mysql-test/t/type_date.test | 9 | ||||
| -rw-r--r-- | mysql-test/t/view.test | 1 |
4 files changed, 15 insertions, 0 deletions
diff --git a/mysql-test/t/delimiter_case_mdev_10728.sql b/mysql-test/t/delimiter_case_mdev_10728.sql new file mode 100644 index 00000000000..72a1dcd9a9e --- /dev/null +++ b/mysql-test/t/delimiter_case_mdev_10728.sql @@ -0,0 +1,3 @@ +DeLiMiTeR A; +SELECT 1 A; +delimiter ; diff --git a/mysql-test/t/delimiter_command_case_sensitivity.test b/mysql-test/t/delimiter_command_case_sensitivity.test new file mode 100644 index 00000000000..2b06a35c723 --- /dev/null +++ b/mysql-test/t/delimiter_command_case_sensitivity.test @@ -0,0 +1,2 @@ +# MDEV-10728 +--exec $MYSQL --default-character-set=binary < "t/delimiter_case_mdev_10728.sql" diff --git a/mysql-test/t/type_date.test b/mysql-test/t/type_date.test index 11924f696db..b7fdf7b93b7 100644 --- a/mysql-test/t/type_date.test +++ b/mysql-test/t/type_date.test @@ -576,6 +576,15 @@ SELECT DATE(a), DATE(b), DATE(c) FROM t1; SELECT DATE(COALESCE(a)), DATE(COALESCE(b)), DATE(COALESCE(c)) FROM t1; DROP TABLE t1; +--echo # +--echo # MDEV-14221 Assertion `0' failed in Item::field_type_for_temporal_comparison +--echo # + +CREATE TABLE t1 (d DATE); +INSERT INTO t1 VALUES ('1985-05-13'),('1989-12-24'); +SELECT d, COUNT(*) FROM t1 GROUP BY d WITH ROLLUP HAVING CASE d WHEN '2017-05-25' THEN 0 ELSE 1 END; +DROP TABLE t1; + --echo # --echo # End of 10.1 tests diff --git a/mysql-test/t/view.test b/mysql-test/t/view.test index a9764bf0668..9e8e483929f 100644 --- a/mysql-test/t/view.test +++ b/mysql-test/t/view.test @@ -1,3 +1,4 @@ +--source include/have_partition.inc # Save the initial number of concurrent sessions. --source include/count_sessions.inc |