1 files changed, 5 insertions, 67 deletions

diff --git a/mysql-test/suite/jp/t/jp_like_ucs2.test b/mysql-test/suite/jp/t/jp_like_ucs2.test
index feae40de49e..1fd7d559e86 100644
--- a/mysql-test/suite/jp/t/jp_like_ucs2.test
+++ b/mysql-test/suite/jp/t/jp_like_ucs2.test
@@ -1,4 +1,5 @@
 --source include/have_ucs2.inc
+--source include/have_innodb.inc
 
 --disable_warnings
 drop table if exists `Ｔ１`;
@@ -10,9 +11,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
 
 #
@@ -29,12 +27,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 the following data in each table
 # jisx0201 hankaku-katakana data
@@ -125,34 +120,6 @@ INSERT INTO `Ｔ９` VALUES
 ,('鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖')
 ,('齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒');
 
-INSERT INTO `Ｔ１０` VALUES
- ('PQRSTUVWXYZ[\\]^_')
-,(' ｡｢｣､･ｦｧｨｩｪｫｬｭｮｯ')
-,('ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ')
-,('ﾀﾁﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌﾍﾎﾏ')
-,('ﾐﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜﾝﾞﾟ');
-
-INSERT INTO `Ｔ１１` VALUES
- ('　　、。，．・：；？！゛゜´｀¨＾￣＿ヽ')
-,('ヾゝゞ〃仝々〆〇ー―‐／＼〜‖｜…‥‘’')
-,('“”（）〔〕［］｛｝〈〉《》「」『』【】')
-,('・ぁあぃいぅうぇえぉおかがきぎくぐけげこ')
-,('とどなにぬねのはばぱひびぴふぶぷへべぺほ')
-,('ぼぽまみむめもゃやゅゆょよらりるれろゎわ')
-,('・ァアィイゥウェエォオカガキギクグケゲコ')
-,('・亜唖娃阿哀愛挨姶逢葵茜穐悪握渥旭葦芦鯵')
-,('・弌丐丕个丱丶丼丿乂乖乘亂亅豫亊舒弍于亞')
-,('・鵝鵞鵤鵑鵐鵙鵲鶉鶇鶫鵯鵺鶚鶤鶩鶲鷄鷁鶻');
-
-INSERT INTO `Ｔ１２` VALUES
- ('・˛˚~΄΅・・・・・・・・¡¦¿・・・')
-,('乚乜乣乨乩乴乵乹乿亍亖亗亝亯亹仃仐仚仛仠')
-,('仡仢仨仯仱仳仵份仾仿伀伂伃伈伋伌伒伕伖众')
-,('伙伮伱你伳伵伷伹伻伾佀佂佈佉佋佌佒佔佖佘')
-,('・黸黿鼂鼃鼉鼏鼐鼑鼒鼔鼖鼗鼙鼚鼛鼟鼢鼦鼪')
-,('鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖')
-,('齗齘齚齝齞齨齩齭齮齯齰齱齳齵齺齽龏龐龑龒');
-
 #INNODB
 SELECT * FROM `Ｔ１` WHERE `Ｃ１` LIKE ' %';
 SELECT * FROM `Ｔ１` WHERE `Ｃ１` LIKE '% %';
@@ -205,7 +172,7 @@ SELECT * FROM `Ｔ６` WHERE `Ｃ１` LIKE '鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃�
 SELECT * FROM `Ｔ６` WHERE `Ｃ１` LIKE '%鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖%';
 SELECT * FROM `Ｔ６` WHERE `Ｃ１` LIKE '%鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖';
 
-#Heap
+#MEMORY
 SELECT * FROM `Ｔ７` WHERE `Ｃ１` LIKE ' %';
 SELECT * FROM `Ｔ７` WHERE `Ｃ１` LIKE '% %';
 SELECT * FROM `Ｔ７` WHERE `Ｃ１` LIKE '% ';
@@ -231,32 +198,6 @@ SELECT * FROM `Ｔ９` WHERE `Ｃ１` LIKE '鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃�
 SELECT * FROM `Ｔ９` WHERE `Ｃ１` LIKE '%鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖%';
 SELECT * FROM `Ｔ９` WHERE `Ｃ１` LIKE '%鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖';
 
-#BDB
-SELECT * FROM `Ｔ１０` WHERE `Ｃ１` LIKE ' %';
-SELECT * FROM `Ｔ１０` WHERE `Ｃ１` LIKE '% %';
-SELECT * FROM `Ｔ１０` WHERE `Ｃ１` LIKE '% ';
-SELECT * FROM `Ｔ１０` WHERE `Ｃ１` LIKE 'ﾀ%';
-SELECT * FROM `Ｔ１０` WHERE `Ｃ１` LIKE '%ﾗﾘ%';
-SELECT * FROM `Ｔ１０` WHERE `Ｃ１` LIKE '%ｿ';
-SELECT * FROM `Ｔ１０` WHERE `Ｃ１` LIKE 'ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ%';
-SELECT * FROM `Ｔ１０` WHERE `Ｃ１` LIKE '%ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ%';
-SELECT * FROM `Ｔ１０` WHERE `Ｃ１` LIKE '%ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ';
-SELECT * FROM `Ｔ１１` WHERE `Ｃ１` LIKE '　%';
-SELECT * FROM `Ｔ１１` WHERE `Ｃ１` LIKE '%　%';
-SELECT * FROM `Ｔ１１` WHERE `Ｃ１` LIKE '%　';
-SELECT * FROM `Ｔ１１` WHERE `Ｃ１` LIKE 'と%';
-SELECT * FROM `Ｔ１１` WHERE `Ｃ１` LIKE '%あ%';
-SELECT * FROM `Ｔ１１` WHERE `Ｃ１` LIKE '%わ';
-SELECT * FROM `Ｔ１１` WHERE `Ｃ１` LIKE '・ぁあぃいぅうぇえぉおかがきぎくぐけげこ%';
-SELECT * FROM `Ｔ１１` WHERE `Ｃ１` LIKE '%・ぁあぃいぅうぇえぉおかがきぎくぐけげこ%';
-SELECT * FROM `Ｔ１１` WHERE `Ｃ１` LIKE '%・ぁあぃいぅうぇえぉおかがきぎくぐけげこ';
-SELECT * FROM `Ｔ１２` WHERE `Ｃ１` LIKE '鼫%';
-SELECT * FROM `Ｔ１２` WHERE `Ｃ１` LIKE '%鼺%';
-SELECT * FROM `Ｔ１２` WHERE `Ｃ１` LIKE '%齖';
-SELECT * FROM `Ｔ１２` WHERE `Ｃ１` LIKE '鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖%';
-SELECT * FROM `Ｔ１２` WHERE `Ｃ１` LIKE '%鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖%';
-SELECT * FROM `Ｔ１２` WHERE `Ｃ１` LIKE '%鼫鼯鼱鼲鼴鼷鼹鼺鼼鼽鼿齁齃齄齅齆齇齓齕齖';
-
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -266,6 +207,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;