1 files changed, 3 insertions, 58 deletions
diff --git a/mysql-test/suite/jp/r/jp_rtrim_utf8.result b/mysql-test/suite/jp/r/jp_rtrim_utf8.result
index 09d719f3386..d793f895793 100644
--- a/mysql-test/suite/jp/r/jp_rtrim_utf8.result
+++ b/mysql-test/suite/jp/r/jp_rtrim_utf8.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 utf8;
 SET character_set_database = utf8;
 CREATE TABLE `Ｔ１` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = innodb;
@@ -16,12 +15,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8
 CREATE TABLE `Ｔ４` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = MEMORY;
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ');
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ ');
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ  ');
@@ -85,27 +81,6 @@ INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡   ');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡　');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡　　');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡　　　');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ ');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ  ');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ   ');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ　');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ　　');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ　　　');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお ');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお  ');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお   ');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお　');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお　　');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお　　　');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡 ');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡  ');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡   ');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡　');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡　　');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡　　　');
 SELECT RTRIM(`Ｃ１`) from `Ｔ１`;
 RTRIM(`Ｃ１`)
 ｱｲｳｴｵ
@@ -187,33 +162,6 @@ RTRIM(`Ｃ１`)
 龔龖龗龞龡　
 龔龖龗龞龡　　
 龔龖龗龞龡　　　
-SELECT RTRIM(`Ｃ１`) from `Ｔ１０`;
-RTRIM(`Ｃ１`)
-ｱｲｳｴｵ
-ｱｲｳｴｵ
-ｱｲｳｴｵ
-ｱｲｳｴｵ
-ｱｲｳｴｵ　
-ｱｲｳｴｵ　　
-ｱｲｳｴｵ　　　
-SELECT RTRIM(`Ｃ１`) from `Ｔ１１`;
-RTRIM(`Ｃ１`)
-あいうえお
-あいうえお
-あいうえお
-あいうえお
-あいうえお　
-あいうえお　　
-あいうえお　　　
-SELECT RTRIM(`Ｃ１`) from `Ｔ１２`;
-RTRIM(`Ｃ１`)
-龔龖龗龞龡
-龔龖龗龞龡
-龔龖龗龞龡
-龔龖龗龞龡
-龔龖龗龞龡　
-龔龖龗龞龡　　
-龔龖龗龞龡　　　
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -223,6 +171,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;