1 files changed, 3 insertions, 67 deletions

diff --git a/mysql-test/suite/jp/r/jp_instr_sjis.result b/mysql-test/suite/jp/r/jp_instr_sjis.result
index 9a6dea5a426..b102b1a1b46 100644
--- a/mysql-test/suite/jp/r/jp_instr_sjis.result
+++ b/mysql-test/suite/jp/r/jp_instr_sjis.result
@@ -7,7 +7,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
 SET NAMES sjis;
 SET character_set_database = sjis;
 CREATE TABLE `Ｔ１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = innodb;
@@ -16,12 +15,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engin
 CREATE TABLE `Ｔ４` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = MEMORY;
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ');
 INSERT INTO `Ｔ２` VALUES ('あいうえお');
 INSERT INTO `Ｔ３` VALUES ('ソ十表予構');
@@ -31,9 +27,6 @@ INSERT INTO `Ｔ６` VALUES ('ソ十表予構');
 INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ');
 INSERT INTO `Ｔ８` VALUES ('あいうえお');
 INSERT INTO `Ｔ９` VALUES ('ソ十表予構');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお');
-INSERT INTO `Ｔ１２` VALUES ('ソ十表予構');
 SELECT INSTR(`Ｃ１`,'ｱ') from `Ｔ１`;
 INSTR(`Ｃ１`,'ｱ')
 1
@@ -196,60 +189,6 @@ INSTR(`Ｃ１`,'構')
 SELECT INSTR(`Ｃ１`,'噂') from `Ｔ９`;
 INSTR(`Ｃ１`,'噂')
 0
-SELECT INSTR(`Ｃ１`,'ｱ') from `Ｔ１０`;
-INSTR(`Ｃ１`,'ｱ')
-1
-SELECT INSTR(`Ｃ１`,'ｲ') from `Ｔ１０`;
-INSTR(`Ｃ１`,'ｲ')
-2
-SELECT INSTR(`Ｃ１`,'ｳ') from `Ｔ１０`;
-INSTR(`Ｃ１`,'ｳ')
-3
-SELECT INSTR(`Ｃ１`,'ｴ') from `Ｔ１０`;
-INSTR(`Ｃ１`,'ｴ')
-4
-SELECT INSTR(`Ｃ１`,'ｵ') from `Ｔ１０`;
-INSTR(`Ｃ１`,'ｵ')
-5
-SELECT INSTR(`Ｃ１`,'ﾝ') from `Ｔ１０`;
-INSTR(`Ｃ１`,'ﾝ')
-0
-SELECT INSTR(`Ｃ１`,'あ') from `Ｔ１１`;
-INSTR(`Ｃ１`,'あ')
-1
-SELECT INSTR(`Ｃ１`,'い') from `Ｔ１１`;
-INSTR(`Ｃ１`,'い')
-2
-SELECT INSTR(`Ｃ１`,'う') from `Ｔ１１`;
-INSTR(`Ｃ１`,'う')
-3
-SELECT INSTR(`Ｃ１`,'え') from `Ｔ１１`;
-INSTR(`Ｃ１`,'え')
-4
-SELECT INSTR(`Ｃ１`,'お') from `Ｔ１１`;
-INSTR(`Ｃ１`,'お')
-5
-SELECT INSTR(`Ｃ１`,'ん') from `Ｔ１１`;
-INSTR(`Ｃ１`,'ん')
-0
-SELECT INSTR(`Ｃ１`,'ソ') from `Ｔ１２`;
-INSTR(`Ｃ１`,'ソ')
-1
-SELECT INSTR(`Ｃ１`,'十') from `Ｔ１２`;
-INSTR(`Ｃ１`,'十')
-2
-SELECT INSTR(`Ｃ１`,'表') from `Ｔ１２`;
-INSTR(`Ｃ１`,'表')
-3
-SELECT INSTR(`Ｃ１`,'予') from `Ｔ１２`;
-INSTR(`Ｃ１`,'予')
-4
-SELECT INSTR(`Ｃ１`,'構') from `Ｔ１２`;
-INSTR(`Ｃ１`,'構')
-5
-SELECT INSTR(`Ｃ１`,'噂') from `Ｔ１２`;
-INSTR(`Ｃ１`,'噂')
-0
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -259,6 +198,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;