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 #