1 files changed, 3 insertions, 60 deletions

diff --git a/mysql-test/suite/jp/r/jp_replace_sjis.result b/mysql-test/suite/jp/r/jp_replace_sjis.result
index 08e45968fdd..b8daf59540c 100644
--- a/mysql-test/suite/jp/r/jp_replace_sjis.result
+++ b/mysql-test/suite/jp/r/jp_replace_sjis.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 sjis;
 SET character_set_database = sjis;
 CREATE TABLE `Ｔ１` (`Ｃ１` char(5)) DEFAULT CHARSET = sjis engine = innodb;
@@ -18,12 +15,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(5)) DEFAULT CHARSET = sjis engine = innodb;
 CREATE TABLE `Ｔ４` (`Ｃ１` char(5)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(5)) DEFAULT CHARSET = sjis engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(5)) DEFAULT CHARSET = sjis engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(5)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(5)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(5)) DEFAULT CHARSET = sjis engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(5)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(5)) DEFAULT CHARSET = sjis engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(5)) DEFAULT CHARSET = sjis engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5)) DEFAULT CHARSET = sjis engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5)) DEFAULT CHARSET = sjis engine = MEMORY;
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ');
 INSERT INTO `Ｔ２` VALUES ('あいうえお');
 INSERT INTO `Ｔ３` VALUES ('ソ十表予構');
@@ -33,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 REPLACE(`Ｃ１`,'ｱ','ｱｱ') FROM `Ｔ１`;
 REPLACE(`Ｃ１`,'ｱ','ｱｱ')
 ｱｱｲｳｴｵ
@@ -171,51 +162,6 @@ REPLACE(`Ｃ１`,'予','予予')
 SELECT REPLACE(`Ｃ１`,'構','構構') FROM `Ｔ９`;
 REPLACE(`Ｃ１`,'構','構構')
 ソ十表予構構
-SELECT REPLACE(`Ｃ１`,'ｱ','ｱｱ') FROM `Ｔ１０`;
-REPLACE(`Ｃ１`,'ｱ','ｱｱ')
-ｱｱｲｳｴｵ
-SELECT REPLACE(`Ｃ１`,'ｲ','ｲｲ') FROM `Ｔ１０`;
-REPLACE(`Ｃ１`,'ｲ','ｲｲ')
-ｱｲｲｳｴｵ
-SELECT REPLACE(`Ｃ１`,'ｳ','ｳｳ') FROM `Ｔ１０`;
-REPLACE(`Ｃ１`,'ｳ','ｳｳ')
-ｱｲｳｳｴｵ
-SELECT REPLACE(`Ｃ１`,'ｴ','ｴｴ') FROM `Ｔ１０`;
-REPLACE(`Ｃ１`,'ｴ','ｴｴ')
-ｱｲｳｴｴｵ
-SELECT REPLACE(`Ｃ１`,'ｵ','ｵｵ') FROM `Ｔ１０`;
-REPLACE(`Ｃ１`,'ｵ','ｵｵ')
-ｱｲｳｴｵｵ
-SELECT REPLACE(`Ｃ１`,'あ','ああ') FROM `Ｔ１１`;
-REPLACE(`Ｃ１`,'あ','ああ')
-ああいうえお
-SELECT REPLACE(`Ｃ１`,'い','いい') FROM `Ｔ１１`;
-REPLACE(`Ｃ１`,'い','いい')
-あいいうえお
-SELECT REPLACE(`Ｃ１`,'う','うう') FROM `Ｔ１１`;
-REPLACE(`Ｃ１`,'う','うう')
-あいううえお
-SELECT REPLACE(`Ｃ１`,'え','ええ') FROM `Ｔ１１`;
-REPLACE(`Ｃ１`,'え','ええ')
-あいうええお
-SELECT REPLACE(`Ｃ１`,'お','おお') FROM `Ｔ１１`;
-REPLACE(`Ｃ１`,'お','おお')
-あいうえおお
-SELECT REPLACE(`Ｃ１`,'ソ','ソソ') FROM `Ｔ１２`;
-REPLACE(`Ｃ１`,'ソ','ソソ')
-ソソ十表予構
-SELECT REPLACE(`Ｃ１`,'十','十十') FROM `Ｔ１２`;
-REPLACE(`Ｃ１`,'十','十十')
-ソ十十表予構
-SELECT REPLACE(`Ｃ１`,'表','表表') FROM `Ｔ１２`;
-REPLACE(`Ｃ１`,'表','表表')
-ソ十表表予構
-SELECT REPLACE(`Ｃ１`,'予','予予') FROM `Ｔ１２`;
-REPLACE(`Ｃ１`,'予','予予')
-ソ十表予予構
-SELECT REPLACE(`Ｃ１`,'構','構構') FROM `Ｔ１２`;
-REPLACE(`Ｃ１`,'構','構構')
-ソ十表予構構
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -225,6 +171,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;