1 files changed, 6 insertions, 40 deletions
diff --git a/mysql-test/suite/jp/t/jp_ltrim_utf8.test b/mysql-test/suite/jp/t/jp_ltrim_utf8.test
index 846ce11163b..3fcd5cbdc66 100644
--- a/mysql-test/suite/jp/t/jp_ltrim_utf8.test
+++ b/mysql-test/suite/jp/t/jp_ltrim_utf8.test
@@ -1,3 +1,5 @@
+--source include/have_utf8.inc
+--source include/have_innodb.inc
 --disable_warnings
 drop table if exists `Ｔ１`;
 drop table if exists `Ｔ２`;
@@ -8,7 +10,6 @@ drop table if exists `Ｔ６`;
 drop table if exists `Ｔ７`;
 drop table if exists `Ｔ８`;
 drop table if exists `Ｔ９`;
-drop table if exists `Ｔ１０`;
 --enable_warnings
 
 #
@@ -24,12 +25,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 (' ｱｲｳｴｵ');
@@ -103,30 +101,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 LTRIM(`Ｃ１`) from `Ｔ１`;
@@ -138,16 +112,11 @@ SELECT LTRIM(`Ｃ１`) from `Ｔ４`;
 SELECT LTRIM(`Ｃ１`) from `Ｔ５`;
 SELECT LTRIM(`Ｃ１`) from `Ｔ６`;
 
-#HEAP
+#MEMORY
 SELECT LTRIM(`Ｃ１`) from `Ｔ７`;
 SELECT LTRIM(`Ｃ１`) from `Ｔ８`;
 SELECT LTRIM(`Ｃ１`) from `Ｔ９`;
 
-#BDB
-SELECT LTRIM(`Ｃ１`) from `Ｔ１０`;
-SELECT LTRIM(`Ｃ１`) from `Ｔ１１`;
-SELECT LTRIM(`Ｃ１`) from `Ｔ１２`;
-
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -157,6 +126,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;