summaryrefslogtreecommitdiff
path: root/mysql-test/t/ctype_ucs2_def.test
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2014-11-18 22:25:47 +0100
committerSergei Golubchik <sergii@pisem.net>2014-11-18 22:25:47 +0100
commitea04a8cfda4963143e3fde38d5dec913c02d35ee (patch)
treece07046aa65b574e31de251758b911a59b194d2a /mysql-test/t/ctype_ucs2_def.test
parenta8bd285f7c0b65f76df0d81472eab270de12532c (diff)
downloadmariadb-git-ea04a8cfda4963143e3fde38d5dec913c02d35ee.tar.gz
MDEV-6805 one can set character_set_client to utf32
use the same restriction for character_set_client on the command line and from SQL. Also: remove strange hack from thd_init_client_charset() that contradicted the manual (collation_connection and character_set_result were not always set)
Diffstat (limited to 'mysql-test/t/ctype_ucs2_def.test')
-rw-r--r--mysql-test/t/ctype_ucs2_def.test2
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/t/ctype_ucs2_def.test b/mysql-test/t/ctype_ucs2_def.test
index b146dc63626..be8e044f2e4 100644
--- a/mysql-test/t/ctype_ucs2_def.test
+++ b/mysql-test/t/ctype_ucs2_def.test
@@ -1,5 +1,7 @@
-- source include/have_ucs2.inc
+call mtr.add_suppression("Cannot use ucs2 as character_set_client");
+
#
# MySQL Bug#15276: MySQL ignores collation-server
#