1 files changed, 3 insertions, 67 deletions

diff --git a/mysql-test/suite/jp/r/jp_locate_sjis.result b/mysql-test/suite/jp/r/jp_locate_sjis.result
index b2455401db8..623d1388673 100644
--- a/mysql-test/suite/jp/r/jp_locate_sjis.result
+++ b/mysql-test/suite/jp/r/jp_locate_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 LOCATE('ｱ',`Ｃ１`) from `Ｔ１`;
 LOCATE('ｱ',`Ｃ１`)
 1
@@ -196,60 +189,6 @@ LOCATE('構',`Ｃ１`)
 SELECT LOCATE('噂',`Ｃ１`) from `Ｔ９`;
 LOCATE('噂',`Ｃ１`)
 0
-SELECT LOCATE('ｱ',`Ｃ１`) from `Ｔ１０`;
-LOCATE('ｱ',`Ｃ１`)
-1
-SELECT LOCATE('ｲ',`Ｃ１`) from `Ｔ１０`;
-LOCATE('ｲ',`Ｃ１`)
-2
-SELECT LOCATE('ｳ',`Ｃ１`) from `Ｔ１０`;
-LOCATE('ｳ',`Ｃ１`)
-3
-SELECT LOCATE('ｴ',`Ｃ１`) from `Ｔ１０`;
-LOCATE('ｴ',`Ｃ１`)
-4
-SELECT LOCATE('ｵ',`Ｃ１`) from `Ｔ１０`;
-LOCATE('ｵ',`Ｃ１`)
-5
-SELECT LOCATE('ﾝ',`Ｃ１`) from `Ｔ１０`;
-LOCATE('ﾝ',`Ｃ１`)
-0
-SELECT LOCATE('あ',`Ｃ１`) from `Ｔ１１`;
-LOCATE('あ',`Ｃ１`)
-1
-SELECT LOCATE('い',`Ｃ１`) from `Ｔ１１`;
-LOCATE('い',`Ｃ１`)
-2
-SELECT LOCATE('う',`Ｃ１`) from `Ｔ１１`;
-LOCATE('う',`Ｃ１`)
-3
-SELECT LOCATE('え',`Ｃ１`) from `Ｔ１１`;
-LOCATE('え',`Ｃ１`)
-4
-SELECT LOCATE('お',`Ｃ１`) from `Ｔ１１`;
-LOCATE('お',`Ｃ１`)
-5
-SELECT LOCATE('ん',`Ｃ１`) from `Ｔ１１`;
-LOCATE('ん',`Ｃ１`)
-0
-SELECT LOCATE('ソ',`Ｃ１`) from `Ｔ１２`;
-LOCATE('ソ',`Ｃ１`)
-1
-SELECT LOCATE('十',`Ｃ１`) from `Ｔ１２`;
-LOCATE('十',`Ｃ１`)
-2
-SELECT LOCATE('表',`Ｃ１`) from `Ｔ１２`;
-LOCATE('表',`Ｃ１`)
-3
-SELECT LOCATE('予',`Ｃ１`) from `Ｔ１２`;
-LOCATE('予',`Ｃ１`)
-4
-SELECT LOCATE('構',`Ｃ１`) from `Ｔ１２`;
-LOCATE('構',`Ｃ１`)
-5
-SELECT LOCATE('噂',`Ｃ１`) from `Ｔ１２`;
-LOCATE('噂',`Ｃ１`)
-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 `Ｔ１２`;