1 files changed, 3 insertions, 65 deletions
diff --git a/mysql-test/suite/jp/r/jp_like_sjis.result b/mysql-test/suite/jp/r/jp_like_sjis.result
index a8145fb08f0..0d9cfff5557 100644
--- a/mysql-test/suite/jp/r/jp_like_sjis.result
+++ b/mysql-test/suite/jp/r/jp_like_sjis.result
@@ -7,9 +7,6 @@ drop table if exists `�s�U`;
 drop table if exists `�s�V`;
 drop table if exists `�s�W`;
 drop table if exists `�s�X`;
-drop table if exists `�s�P�O`;
-drop table if exists `�s�P�P`;
-drop table if exists `�s�P�Q`;
 SET NAMES sjis;
 SET character_set_database = sjis;
 CREATE TABLE `�s�P` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = innodb;
@@ -18,12 +15,9 @@ CREATE TABLE `�s�R` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engi
 CREATE TABLE `�s�S` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�T` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `�s�U` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = myisam;
-CREATE TABLE `�s�V` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�W` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�X` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `�s�P�O` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�P` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `�s�P�Q` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `�s�V` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�W` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `�s�X` (`�b�P` char(20), INDEX(`�b�P`)) DEFAULT CHARSET = sjis engine = MEMORY;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `�s�P`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `�s�Q`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `�s�R`;
@@ -33,9 +27,6 @@ LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `�s�U`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `�s�V`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `�s�W`;
 LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `�s�X`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0201_sjis.dat' INTO TABLE `�s�P�O`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis.dat' INTO TABLE `�s�P�P`;
-LOAD DATA LOCAL INFILE 'suite/jp/std_data/jisx0208_sjis2.dat' INTO TABLE `�s�P�Q`;
 SELECT * FROM `�s�P` WHERE `�b�P` LIKE ' %';
 �b�P
  !"#$%&'()*+,-./
@@ -258,56 +249,6 @@ SELECT * FROM `�s�X` WHERE `�b�P` LIKE '%�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�
 SELECT * FROM `�s�X` WHERE `�b�P` LIKE '%�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\';
 �b�P
 �\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\
-SELECT * FROM `�s�P�O` WHERE `�b�P` LIKE ' %';
-�b�P
- !"#$%&'()*+,-./
- ���������������
-SELECT * FROM `�s�P�O` WHERE `�b�P` LIKE '% %';
-�b�P
- !"#$%&'()*+,-./
- ���������������
-SELECT * FROM `�s�P�O` WHERE `�b�P` LIKE '% ';
-�b�P
-SELECT * FROM `�s�P�O` WHERE `�b�P` LIKE '�%';
-�b�P
-����������������
-SELECT * FROM `�s�P�O` WHERE `�b�P` LIKE '%��%';
-�b�P
-����������������
-SELECT * FROM `�s�P�O` WHERE `�b�P` LIKE '%�';
-�b�P
-����������������
-SELECT * FROM `�s�P�O` WHERE `�b�P` LIKE '%����������������';
-�b�P
-����������������
-SELECT * FROM `�s�P�P` WHERE `�b�P` LIKE '�@%';
-�b�P
-�@�@�A�B�C�D�E�F�G�H�I�J�K�L�M�N�O�P�Q�R
-SELECT * FROM `�s�P�P` WHERE `�b�P` LIKE '%�@%';
-�b�P
-�@�@�A�B�C�D�E�F�G�H�I�J�K�L�M�N�O�P�Q�R
-�E�E�������������E�E�E�E���E�E�E�E�@
-SELECT * FROM `�s�P�P` WHERE `�b�P` LIKE '%�@';
-�b�P
-�E�E�������������E�E�E�E���E�E�E�E�@
-SELECT * FROM `�s�P�P` WHERE `�b�P` LIKE '��%';
-�b�P
-�ƂǂȂɂʂ˂̂͂΂ςЂт҂ӂԂՂւׂ؂�
-SELECT * FROM `�s�P�P` WHERE `�b�P` LIKE '%��%';
-�b�P
-�E��������������������������������������
-SELECT * FROM `�s�P�P` WHERE `�b�P` LIKE '%��';
-�b�P
-�ڂۂ܂݂ނ߂���������������
-SELECT * FROM `�s�P�Q` WHERE `�b�P` LIKE '�\%';
-�b�P
-�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\
-SELECT * FROM `�s�P�Q` WHERE `�b�P` LIKE '%�\%';
-�b�P
-�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\
-SELECT * FROM `�s�P�Q` WHERE `�b�P` LIKE '%�\';
-�b�P
-�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\
 DROP TABLE `�s�P`;
 DROP TABLE `�s�Q`;
 DROP TABLE `�s�R`;
@@ -317,6 +258,3 @@ DROP TABLE `�s�U`;
 DROP TABLE `�s�V`;
 DROP TABLE `�s�W`;
 DROP TABLE `�s�X`;
-DROP TABLE `�s�P�O`;
-DROP TABLE `�s�P�P`;
-DROP TABLE `�s�P�Q`;