From 05750812d6843993fb72b492383eda1471b188de Mon Sep 17 00:00:00 2001
From: "kaa@polly.local" <>
Date: Wed, 21 Feb 2007 19:50:48 +0300
Subject: [PATCH] Moved the test requiring cp932 to a separate unit.

This is for bug #18743.
---
 mysql-test/r/mysql_cp932.result | 10 ++++++++++
 mysql-test/t/mysql.test         | 14 --------------
 mysql-test/t/mysql_cp932.test   | 22 ++++++++++++++++++++++
 3 files changed, 32 insertions(+), 14 deletions(-)
 create mode 100644 mysql-test/r/mysql_cp932.result
 create mode 100644 mysql-test/t/mysql_cp932.test

diff --git a/mysql-test/r/mysql_cp932.result b/mysql-test/r/mysql_cp932.result
new file mode 100644
index 00000000000..e15c97720cd
--- /dev/null
+++ b/mysql-test/r/mysql_cp932.result
@@ -0,0 +1,10 @@
+ソ
+ソ
+c_cp932
+ソ
+ソ
+ソ
+繧ｽ
+繧ｽ
+ソ
+ソ
diff --git a/mysql-test/t/mysql.test b/mysql-test/t/mysql.test
index 2306d981ad8..b999c5c0029 100644
--- a/mysql-test/t/mysql.test
+++ b/mysql-test/t/mysql.test
@@ -43,20 +43,6 @@ lock tables t1 write;
 unlock tables;
 drop table t1;
 
-#
-# BUG#16217 - MySQL client misinterprets multi-byte char as escape `\' 
-#
-
-# new command \C or charset
---exec $MYSQL --default-character-set=utf8 test -e "\C cp932 \g"
---exec $MYSQL --default-character-set=cp932 test -e "charset utf8;"
-
-# its usage to switch internally in mysql to requested charset
---exec $MYSQL --default-character-set=utf8 test -e "charset cp932; select 'ソ'; create table t1 (c_cp932 TEXT CHARACTER SET cp932); insert into t1 values('ソ'); select * from t1;  drop table t1;"
---exec $MYSQL --default-character-set=utf8 test -e "charset cp932; select 'ソ'"
---exec $MYSQL --default-character-set=utf8 test -e "/*charset cp932 */; set character_set_client= cp932; select 'ソ'"
---exec $MYSQL --default-character-set=utf8 test -e "/*!\C cp932 */; set character_set_client= cp932; select 'ソ'"
-
 #
 # Bug#16859 -- NULLs in columns must not truncate data as if a C-language "string".
 #
diff --git a/mysql-test/t/mysql_cp932.test b/mysql-test/t/mysql_cp932.test
new file mode 100644
index 00000000000..60a129c3805
--- /dev/null
+++ b/mysql-test/t/mysql_cp932.test
@@ -0,0 +1,22 @@
+# This test should work in embedded server after we fix mysqltest
+-- source include/not_embedded.inc
+
+#
+# Tests from mysql.test which require the cp932 character set
+#
+-- source include/have_cp932.inc
+
+#
+# BUG#16217 - MySQL client misinterprets multi-byte char as escape `\' 
+#
+
+# new command \C or charset
+--exec $MYSQL --default-character-set=utf8 test -e "\C cp932 \g"
+--exec $MYSQL --default-character-set=cp932 test -e "charset utf8;"
+
+# its usage to switch internally in mysql to requested charset
+--exec $MYSQL --default-character-set=utf8 test -e "charset cp932; select 'ソ'; create table t1 (c_cp932 TEXT CHARACTER SET cp932); insert into t1 values('ソ'); select * from t1;  drop table t1;"
+--exec $MYSQL --default-character-set=utf8 test -e "charset cp932; select 'ソ'"
+--exec $MYSQL --default-character-set=utf8 test -e "/*charset cp932 */; set character_set_client= cp932; select 'ソ'"
+--exec $MYSQL --default-character-set=utf8 test -e "/*!\C cp932 */; set character_set_client= cp932; select 'ソ'"
+