1 files changed, 5 insertions, 24 deletions

diff --git a/mysql-test/suite/jp/t/jp_update_ucs2.test b/mysql-test/suite/jp/t/jp_update_ucs2.test
index 7a3c1233210..33a5ce63f96 100644
--- a/mysql-test/suite/jp/t/jp_update_ucs2.test
+++ b/mysql-test/suite/jp/t/jp_update_ucs2.test
@@ -1,4 +1,5 @@
 --source include/have_ucs2.inc
+--source include/have_innodb.inc
 
 --disable_warnings
 drop table if exists `Ｔ１`;
@@ -10,9 +11,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 `Ｔ１２`;
 --enable_warnings
 
 #
@@ -29,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 ('あいうえお');
@@ -45,9 +40,6 @@ INSERT INTO `Ｔ６` VALUES ('龔龖龗龞龡');
 INSERT INTO `Ｔ７` VALUES ('ｱｲｳｴｵ');
 INSERT INTO `Ｔ８` VALUES ('あいうえお');
 INSERT INTO `Ｔ９` VALUES ('龔龖龗龞龡');
-INSERT INTO `Ｔ１０` VALUES ('ｱｲｳｴｵ');
-INSERT INTO `Ｔ１１` VALUES ('あいうえお');
-INSERT INTO `Ｔ１２` VALUES ('龔龖龗龞龡');
 
 UPDATE `Ｔ１` SET `Ｃ１` = ('ｶｷｸｹｺ');
 UPDATE `Ｔ２` SET `Ｃ１` = ('かきくけこ');
@@ -58,9 +50,6 @@ UPDATE `Ｔ６` SET `Ｃ１` = ('齗齘齚齝齞');
 UPDATE `Ｔ７` SET `Ｃ１` = ('ｶｷｸｹｺ');
 UPDATE `Ｔ８` SET `Ｃ１` = ('かきくけこ');
 UPDATE `Ｔ９` SET `Ｃ１` = ('齗齘齚齝齞');
-UPDATE `Ｔ１０` SET `Ｃ１` = ('ｶｷｸｹｺ');
-UPDATE `Ｔ１１` SET `Ｃ１` = ('かきくけこ');
-UPDATE `Ｔ１２` SET `Ｃ１` = ('齗齘齚齝齞');
 
 #InnoDB
 SELECT * FROM `Ｔ１`;
@@ -72,16 +61,11 @@ SELECT * FROM `Ｔ４`;
 SELECT * FROM `Ｔ５`;
 SELECT * FROM `Ｔ６`;
 
-#HEAP
+#MEMORY
 SELECT * FROM `Ｔ７`;
 SELECT * FROM `Ｔ８`;
 SELECT * FROM `Ｔ９`;
 
-#BDB
-SELECT * FROM `Ｔ１０`;
-SELECT * FROM `Ｔ１１`;
-SELECT * FROM `Ｔ１２`;
-
 DROP TABLE `Ｔ１`;
 DROP TABLE `Ｔ２`;
 DROP TABLE `Ｔ３`;
@@ -91,6 +75,3 @@ DROP TABLE `Ｔ６`;
 DROP TABLE `Ｔ７`;
 DROP TABLE `Ｔ８`;
 DROP TABLE `Ｔ９`;
-DROP TABLE `Ｔ１０`;
-DROP TABLE `Ｔ１１`;
-DROP TABLE `Ｔ１２`;