summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.org>2015-06-09 15:02:53 +0400
committerAlexander Barkov <bar@mariadb.org>2015-06-09 15:02:53 +0400
commitb0928711e048a164fcc0e7bf64a4190a82f09b57 (patch)
tree61a7c3734d2ff58e2be1bfb6e4c3a61d45bcf2d0
parent70b82efd20ec6682a6ede8552b1109d04d372e0c (diff)
downloadmariadb-git-b0928711e048a164fcc0e7bf64a4190a82f09b57.tar.gz
Adding a test for "MDEV-6973 XOR aggregates argument collations".
The bug itself was earlier fixed by this patch: commit 3709c7fc6d46c624c24523907eb2a0ad8a1e5062 MDEV-8222 "string_field LIKE int_const" returns a wrong result in case of UCS2 MDEV-8257 Erroneous "Impossible where" when mixing decimal comparison and LIKE
-rw-r--r--mysql-test/r/ctype_uca.result12
-rw-r--r--mysql-test/t/ctype_uca.test14
2 files changed, 26 insertions, 0 deletions
diff --git a/mysql-test/r/ctype_uca.result b/mysql-test/r/ctype_uca.result
index 02809f3be22..8dd86fc5f1e 100644
--- a/mysql-test/r/ctype_uca.result
+++ b/mysql-test/r/ctype_uca.result
@@ -13573,3 +13573,15 @@ DROP TABLE t1;
#
# End of MariaDB-10.0 tests
#
+#
+# Start of MariaDB-10.1 tests
+#
+#
+# MDEV-6973 XOR aggregates argument collations
+#
+SELECT '10' COLLATE utf8_general_ci XOR '20' COLLATE utf8_unicode_ci;
+'10' COLLATE utf8_general_ci XOR '20' COLLATE utf8_unicode_ci
+0
+#
+# End of MariaDB-10.1 tests
+#
diff --git a/mysql-test/t/ctype_uca.test b/mysql-test/t/ctype_uca.test
index 5e8195e4718..f30eda37154 100644
--- a/mysql-test/t/ctype_uca.test
+++ b/mysql-test/t/ctype_uca.test
@@ -620,3 +620,17 @@ DROP TABLE t1;
--echo #
--echo # End of MariaDB-10.0 tests
--echo #
+
+--echo #
+--echo # Start of MariaDB-10.1 tests
+--echo #
+
+--echo #
+--echo # MDEV-6973 XOR aggregates argument collations
+--echo #
+SELECT '10' COLLATE utf8_general_ci XOR '20' COLLATE utf8_unicode_ci;
+
+
+--echo #
+--echo # End of MariaDB-10.1 tests
+--echo #