1 files changed, 3 insertions, 62 deletions
diff --git a/mysql-test/suite/jp/r/jp_like_utf8.result b/mysql-test/suite/jp/r/jp_like_utf8.result
index bf48da79951..2ac95ba4d6a 100644
--- a/mysql-test/suite/jp/r/jp_like_utf8.result
+++ b/mysql-test/suite/jp/r/jp_like_utf8.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 utf8;
 SET character_set_database = utf8;
 CREATE TABLE `Ｔ１` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = innodb;
@@ -18,12 +15,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf
 CREATE TABLE `Ｔ４` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(20), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = MEMORY;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_utf8.dat' INTO TABLE `Ｔ１`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_utf8.dat' INTO TABLE `Ｔ２`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `Ｔ３`;
@@ -33,9 +27,6 @@ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `Ｔ６`
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_utf8.dat' INTO TABLE `Ｔ７`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_utf8.dat' INTO TABLE `Ｔ８`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `Ｔ９`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_utf8.dat' INTO TABLE `Ｔ１０`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_utf8.dat' INTO TABLE `Ｔ１１`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0212_utf8.dat' INTO TABLE `Ｔ１２`;
 SELECT * FROM `Ｔ１` WHERE `Ｃ１` LIKE ' %';
 Ｃ１
  !"#$%&'()*+,-./
@@ -258,53 +249,6 @@ 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 `Ｔ３`;
@@ -314,6 +258,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;