1 files changed, 8 insertions, 55 deletions

diff --git a/mysql-test/suite/jp/t/jp_charset_ucs2.test b/mysql-test/suite/jp/t/jp_charset_ucs2.test
index 5183071033b..8427d721339 100644
--- a/mysql-test/suite/jp/t/jp_charset_ucs2.test
+++ b/mysql-test/suite/jp/t/jp_charset_ucs2.test
@@ -1,4 +1,8 @@
+--source include/have_sjis.inc
 --source include/have_ucs2.inc
+--source include/have_ujis.inc
+--source include/have_utf8.inc
+--source include/have_innodb.inc
 
 --disable_warnings
 drop table if exists `Ｔ１`;
@@ -10,9 +14,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
-drop table if exists `Ｔ１１`;
-drop table if exists `Ｔ１２`;
 --enable_warnings
 
 #
@@ -27,12 +28,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(20)) DEFAULT CHARSET = ucs2 engine = innodb;
 CREATE TABLE `Ｔ４` (`Ｃ１` char(20)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(20)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(20)) DEFAULT CHARSET = ucs2 engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(20)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(20)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(20)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(20)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(20)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(20)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(20)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(20)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(20)) DEFAULT CHARSET = ucs2 engine = MEMORY;
 
 #Insert the following data in each table
 # jisx0201 hankaku-katakana data
@@ -114,31 +112,6 @@ INSERT INTO `Ｔ９` VALUES
 ,('鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖')
 ,('齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒');
 
-INSERT INTO `Ｔ１０` VALUES
- ('PQRSTUVWXYZ[\\]^_')
-,(' ｡｢｣､･ｦｧｨｩｪｫｬｭｮｯ')
-,('ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ')
-,('ﾀﾁﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌﾍﾎﾏ')
-,('ﾐﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜﾝﾞﾟ');
-
-INSERT INTO `Ｔ１１` VALUES
- ('ヾゝゞ〃仝々〆〇ー―‐／＼〜‖｜…‥‘’')
-,('“”（）〔〕［］｛｝〈〉《》「」『』【】')
-,('・ぁあぃいぅうぇえぉおかがきぎくぐけげこ')
-,('・ァアィイゥウェエォオカガキギクグケゲコ')
-,('・亜唖娃阿哀愛挨姶逢葵茜穐悪握渥旭葦芦鯵')
-,('・弌丐丕个丱丶丼丿乂乖乘亂亅豫亊舒弍于亞')
-,('・鵝鵞鵤鵑鵐鵙鵲鶉鶇鶫鵯鵺鶚鶤鶩鶲鷄鷁鶻');
-
-INSERT INTO `Ｔ１２` VALUES
- ('・˛˚~΄΅・・・・・・・・¡¦¿・・・')
-,('乚乜乣乨乩乴乵乹乿亍亖亗亝亯亹仃仐仚仛仠')
-,('仡仢仨仯仱仳仵份仾仿伀伂伃伈伋伌伒伕伖众')
-,('伙伮伱你伳伵伷伹伻伾佀佂佈佉佋佌佒佔佖佘')
-,('・黸黿鼂鼃鼉鼏鼐鼑鼒鼔鼖鼗鼙鼚鼛鼟鼢鼦鼪')
-,('鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖')
-,('齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒');
- 
 #InnoDB
 SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ１`;
 SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ２`;
@@ -173,7 +146,7 @@ SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ６`;
 SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING sjis)) FROM `Ｔ６`;
 SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ujis)) FROM `Ｔ６`;
 
-#Heap
+#MEMORY
 SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ７`;
 SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ８`;
 SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ９`;
@@ -190,23 +163,6 @@ SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ９`;
 SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING sjis)) FROM `Ｔ９`;
 SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ujis)) FROM `Ｔ９`;
 
-#BDB
-SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ１０`;
-SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ１１`;
-SELECT DISTINCT CHARSET(`Ｃ１`) FROM `Ｔ１２`;
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING utf8)) FROM `Ｔ１０`;
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ１０`;
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING sjis)) FROM `Ｔ１０`;
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ujis)) FROM `Ｔ１０`;
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING utf8)) FROM `Ｔ１１`;
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ１１`;
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING sjis)) FROM `Ｔ１１`;
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ujis)) FROM `Ｔ１１`;
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING utf8)) FROM `Ｔ１２`;
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ucs2)) FROM `Ｔ１２`;
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING sjis)) FROM `Ｔ１２`;
-SELECT DISTINCT CHARSET(CONVERT(`Ｃ１` USING ujis)) FROM `Ｔ１２`;
-
 drop table `Ｔ１`;
 drop table `Ｔ２`;
 drop table `Ｔ３`;
@@ -216,6 +172,3 @@ drop table `Ｔ６`;
 drop table `Ｔ７`;
 drop table `Ｔ８`;
 drop table `Ｔ９`;
-drop table `Ｔ１０`;
-drop table `Ｔ１１`;
-drop table `Ｔ１２`;