summaryrefslogtreecommitdiff
path: root/mysql-test/t/type_set.test
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-05-13 11:12:31 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2020-05-13 11:12:31 +0300
commit6bc4444d7ca81786de98f27669891692c2d2e21c (patch)
tree329efac8c8caeb0f1644b8cea9772d33ab3948eb /mysql-test/t/type_set.test
parent218d20ffe3d4e833eb20a75d880fec1c1507b221 (diff)
parent23d3d180ca47954c8138fee2a4356e0f7e531fc3 (diff)
downloadmariadb-git-6bc4444d7ca81786de98f27669891692c2d2e21c.tar.gz
Merge 10.1 into 10.2
Diffstat (limited to 'mysql-test/t/type_set.test')
-rw-r--r--mysql-test/t/type_set.test2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/type_set.test b/mysql-test/t/type_set.test
index 7a79cd12f70..31dc7a11e2d 100644
--- a/mysql-test/t/type_set.test
+++ b/mysql-test/t/type_set.test
@@ -102,7 +102,7 @@ DROP TABLE t1;
--echo #
--echo #
---echo # MDEV-6950 Bad results with joins compating DATE and INT/ENUM/VARCHAR columns
+--echo # MDEV-6950 Bad results with joins comparing DATE and INT/ENUM/VARCHAR columns
--echo #
CREATE TABLE t1 (c1 DATE PRIMARY KEY);