diff --git a/mysql-test/include/have_cp932.inc b/mysql-test/include/have_cp932.inc new file mode 100644 index 00000000000..b500dac0bbe --- /dev/null +++ b/mysql-test/include/have_cp932.inc @@ -0,0 +1,4 @@ +-- require r/have_cp932.require +disable_query_log; +show collation like "cp932_japanese_ci"; +enable_query_log; diff --git a/mysql-test/include/have_eucjpms.inc b/mysql-test/include/have_eucjpms.inc new file mode 100644 index 00000000000..a5e1a5ac547 --- /dev/null +++ b/mysql-test/include/have_eucjpms.inc @@ -0,0 +1,4 @@ +-- require r/have_eucjpms.require +disable_query_log; +show collation like "eucjpms_japanese_ci"; +enable_query_log; diff --git a/mysql-test/r/have_cp932.require b/mysql-test/r/have_cp932.require new file mode 100644 index 00000000000..988d720ed2c --- /dev/null +++ b/mysql-test/r/have_cp932.require @@ -0,0 +1,2 @@ +Collation Charset Id Default Compiled Sortlen +cp932_japanese_ci cp932 95 Yes Yes 1 diff --git a/mysql-test/r/have_eucjpms.require b/mysql-test/r/have_eucjpms.require new file mode 100644 index 00000000000..f35621b2c1a --- /dev/null +++ b/mysql-test/r/have_eucjpms.require @@ -0,0 +1,2 @@ +Collation Charset Id Default Compiled Sortlen +eucjpms_japanese_ci eucjpms 97 Yes Yes 1 diff --git a/mysql-test/t/ctype_cp932.test b/mysql-test/t/ctype_cp932.test index 24da8a76dcd..fed87af3adc 100644 --- a/mysql-test/t/ctype_cp932.test +++ b/mysql-test/t/ctype_cp932.test @@ -1,3 +1,5 @@ +-- source include/have_cp932.inc + --character_set cp932 --disable_warnings drop table if exists t1; diff --git a/mysql-test/t/ctype_eucjpms.test b/mysql-test/t/ctype_eucjpms.test index 578d116fcb9..cec1e2a9861 100644 --- a/mysql-test/t/ctype_eucjpms.test +++ b/mysql-test/t/ctype_eucjpms.test @@ -1,3 +1,6 @@ +-- source include/have_eucjpms.inc + + --disable_warnings drop table if exists t1; drop table if exists t2;