1 files changed, 3 insertions, 60 deletions
diff --git a/mysql-test/suite/jp/r/jp_replace_utf8.result b/mysql-test/suite/jp/r/jp_replace_utf8.result
index 16981fcd0d8..734e1e3d6a9 100644
--- a/mysql-test/suite/jp/r/jp_replace_utf8.result
+++ b/mysql-test/suite/jp/r/jp_replace_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(5)) DEFAULT CHARSET = utf8 engine = innodb;
@@ -18,12 +15,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = innodb;
 CREATE TABLE `Ｔ４` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5)) DEFAULT CHARSET = utf8 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 `Ｔ１２`;