1 files changed, 3 insertions, 43 deletions

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