1 files changed, 3 insertions, 39 deletions

diff --git a/mysql-test/suite/jp/r/jp_lpad_sjis.result b/mysql-test/suite/jp/r/jp_lpad_sjis.result
index b45427ebf3d..46cbde52192 100644
--- a/mysql-test/suite/jp/r/jp_lpad_sjis.result
+++ b/mysql-test/suite/jp/r/jp_lpad_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), INDEX(`Ｃ１`)) DEFAULT CHARSET = sjis engine = innodb;
@@ -18,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 ('ソ十表予構'),('ソ十表予'),('ソ十表'),('ソ十'),('ソ'),('');
@@ -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 `Ｃ１`, LPAD(`Ｃ１`,5,'｡') FROM `Ｔ１`;
 Ｃ１	LPAD(`Ｃ１`,5,'｡')
 	｡｡｡｡｡
@@ -108,30 +99,6 @@ SELECT `Ｃ１`, LPAD(`Ｃ１`,5,'暴' ) FROM `Ｔ９`;
 ソ十	暴暴暴ソ十
 ソ	暴暴暴暴ソ
 	暴暴暴暴暴
-SELECT `Ｃ１`, LPAD(`Ｃ１`,5,'｡') FROM `Ｔ１０`;
-Ｃ１	LPAD(`Ｃ１`,5,'｡')
-ｱｲｳｴｵ	ｱｲｳｴｵ
-ｱｲｳｴ	｡ｱｲｳｴ
-ｱｲｳ	｡｡ｱｲｳ
-ｱｲ	｡｡｡ｱｲ
-ｱ	｡｡｡｡ｱ
-	｡｡｡｡｡
-SELECT `Ｃ１`, LPAD(`Ｃ１`,5,'Ｘ') FROM `Ｔ１１`;
-Ｃ１	LPAD(`Ｃ１`,5,'Ｘ')
-あいうえお	あいうえお
-あいうえ	Ｘあいうえ
-あいう	ＸＸあいう
-あい	ＸＸＸあい
-あ	ＸＸＸＸあ
-	ＸＸＸＸＸ
-SELECT `Ｃ１`, LPAD(`Ｃ１`,5,'暴' ) FROM `Ｔ１２`;
-Ｃ１	LPAD(`Ｃ１`,5,'暴' )
-ソ十表予構	ソ十表予構
-ソ十表予	暴ソ十表予
-ソ十表	暴暴ソ十表
-ソ十	暴暴暴ソ十
-ソ	暴暴暴暴ソ
-	暴暴暴暴暴
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -141,6 +108,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;