1 files changed, 5 insertions, 40 deletions

diff --git a/mysql-test/suite/jp/t/jp_rtrim_ucs2.test b/mysql-test/suite/jp/t/jp_rtrim_ucs2.test
index 0fac38d12d1..84cd1ce4b2a 100644
--- a/mysql-test/suite/jp/t/jp_rtrim_ucs2.test
+++ b/mysql-test/suite/jp/t/jp_rtrim_ucs2.test
@@ -1,4 +1,5 @@
 --source include/have_ucs2.inc
+--source include/have_innodb.inc
 
 --disable_warnings
 drop table if exists `Ｔ１`;
@@ -10,7 +11,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
 --enable_warnings
 
 #
@@ -27,12 +27,9 @@ CREATE TABLE `Ｔ３` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engin
 CREATE TABLE `Ｔ４` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(8), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
 
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ');
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ ');
@@ -106,30 +103,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 ('ｱｲｳｴｵ   ');
-# Double byte spaces are not supposed to be trimed
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ　');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ　　');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ　　　');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお ');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお  ');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお   ');
-# Double byte spaces are not supposed to be trimed
-INSERT INTO `Ｔ１１` VALUES ('あいうえお　');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお　　');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお　　　');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡 ');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡  ');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡   ');
-# Double byte spaces are not supposed to be trimed
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡　');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡　　');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡　　　');
 
 #InnoDB
 SELECT RTRIM(`Ｃ１`) from `Ｔ１`;
@@ -141,16 +114,11 @@ SELECT RTRIM(`Ｃ１`) from `Ｔ４`;
 SELECT RTRIM(`Ｃ１`) from `Ｔ５`;
 SELECT RTRIM(`Ｃ１`) from `Ｔ６`;
 
-#HEAP
+#MEMORY
 SELECT RTRIM(`Ｃ１`) from `Ｔ７`;
 SELECT RTRIM(`Ｃ１`) from `Ｔ８`;
 SELECT RTRIM(`Ｃ１`) from `Ｔ９`;
 
-#BDB
-SELECT RTRIM(`Ｃ１`) from `Ｔ１０`;
-SELECT RTRIM(`Ｃ１`) from `Ｔ１１`;
-SELECT RTRIM(`Ｃ１`) from `Ｔ１２`;
-
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -160,6 +128,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;