1 files changed, 5 insertions, 34 deletions

diff --git a/mysql-test/suite/jp/t/jp_instr_ucs2.test b/mysql-test/suite/jp/t/jp_instr_ucs2.test
index b8f83961e90..a074e31569f 100644
--- a/mysql-test/suite/jp/t/jp_instr_ucs2.test
+++ b/mysql-test/suite/jp/t/jp_instr_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(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engin
 CREATE TABLE `Ｔ４` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ５` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
 CREATE TABLE `Ｔ６` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = myisam;
-CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = heap;
-CREATE TABLE `Ｔ１０` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１１` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
-CREATE TABLE `Ｔ１２` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = bdb;
+CREATE TABLE `Ｔ７` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` char(5), INDEX(`Ｃ１`)) DEFAULT CHARSET = ucs2 engine = MEMORY;
 
 INSERT INTO `Ｔ１` VALUES ('ｱｲｳｴｵ');
 INSERT INTO `Ｔ２` VALUES ('あいうえお');
@@ -43,9 +40,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡');
 INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ');
 INSERT INTO `Ｔ８` VALUES ('あいうえお');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡');
 
 #InnoDB
 SELECT INSTR(`Ｃ１`,'ｱ') from `Ｔ１`;
@@ -87,7 +81,7 @@ SELECT INSTR(`Ｃ１`,'龞') from `Ｔ６`;
 SELECT INSTR(`Ｃ１`,'龡') from `Ｔ６`;
 SELECT INSTR(`Ｃ１`,'丂') from `Ｔ６`;
 
-#HEAP
+#MEMORY
 SELECT INSTR(`Ｃ１`,'ｱ') from `Ｔ７`;
 SELECT INSTR(`Ｃ１`,'ｲ') from `Ｔ７`;
 SELECT INSTR(`Ｃ１`,'ｳ') from `Ｔ７`;
@@ -107,26 +101,6 @@ SELECT INSTR(`Ｃ１`,'龞') from `Ｔ９`;
 SELECT INSTR(`Ｃ１`,'龡') from `Ｔ９`;
 SELECT INSTR(`Ｃ１`,'丂') from `Ｔ９`;
 
-#BDB
-SELECT INSTR(`Ｃ１`,'ｱ') from `Ｔ１０`;
-SELECT INSTR(`Ｃ１`,'ｲ') from `Ｔ１０`;
-SELECT INSTR(`Ｃ１`,'ｳ') from `Ｔ１０`;
-SELECT INSTR(`Ｃ１`,'ｴ') from `Ｔ１０`;
-SELECT INSTR(`Ｃ１`,'ｵ') from `Ｔ１０`;
-SELECT INSTR(`Ｃ１`,'ﾝ') from `Ｔ１０`;
-SELECT INSTR(`Ｃ１`,'あ') from `Ｔ１１`;
-SELECT INSTR(`Ｃ１`,'い') from `Ｔ１１`;
-SELECT INSTR(`Ｃ１`,'う') from `Ｔ１１`;
-SELECT INSTR(`Ｃ１`,'え') from `Ｔ１１`;
-SELECT INSTR(`Ｃ１`,'お') from `Ｔ１１`;
-SELECT INSTR(`Ｃ１`,'ん') from `Ｔ１１`;
-SELECT INSTR(`Ｃ１`,'龔') from `Ｔ１２`;
-SELECT INSTR(`Ｃ１`,'龖') from `Ｔ１２`;
-SELECT INSTR(`Ｃ１`,'龗') from `Ｔ１２`;
-SELECT INSTR(`Ｃ１`,'龞') from `Ｔ１２`;
-SELECT INSTR(`Ｃ１`,'龡') from `Ｔ１２`;
-SELECT INSTR(`Ｃ１`,'丂') from `Ｔ１２`;
-
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -136,6 +110,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;