1 files changed, 5 insertions, 31 deletions

diff --git a/mysql-test/suite/jp/t/jp_union_ujis.test b/mysql-test/suite/jp/t/jp_union_ujis.test
index e36d18c85c0..73c9c6607ad 100644
--- a/mysql-test/suite/jp/t/jp_union_ujis.test
+++ b/mysql-test/suite/jp/t/jp_union_ujis.test
@@ -1,4 +1,5 @@
 --source include/have_ujis.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
 
 #
@@ -70,34 +68,10 @@ DROP TABLE `｣ﾔ｣ｱ` ;
 DROP TABLE `｣ﾔ｣ｲ` ;
 DROP TABLE `｣ﾔ｣ｳ` ;
 
-#HEAP
-CREATE TABLE `｣ﾔ｣ｱ` (`｣ﾃ｣ｱ` char(1), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = HEAP;
-CREATE TABLE `｣ﾔ｣ｲ` (`｣ﾃ｣ｱ` char(1), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = HEAP;
-CREATE TABLE `｣ﾔ｣ｳ` (`｣ﾃ｣ｱ` char(1), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = HEAP;
-INSERT INTO `｣ﾔ｣ｱ` VALUES('竺'),('竺'),('､｢'),('､｢'),('常ﾜ'),('常ﾜ');
-INSERT INTO `｣ﾔ｣ｲ` VALUES('軸'),('軸'),('､､'),('､､'),('常ﾝ'),('常ﾝ');
-INSERT INTO `｣ﾔ｣ｳ` VALUES('宍'),('宍'),('､ｦ'),('､ｦ'),('常ﾞ'),('常ﾞ');
-SELECT * FROM `｣ﾔ｣ｱ` UNION DISTINCT SELECT * FROM `｣ﾔ｣ｲ` ORDER BY `｣ﾃ｣ｱ`;
-SELECT * FROM `｣ﾔ｣ｱ` UNION ALL SELECT * FROM `｣ﾔ｣ｲ` ORDER BY `｣ﾃ｣ｱ`;
-(SELECT * FROM `｣ﾔ｣ｱ`) UNION (SELECT * FROM `｣ﾔ｣ｲ`) UNION (SELECT '､ｦ') ORDER BY `｣ﾃ｣ｱ`;
-(SELECT '､ｦ' AS `｣ﾃ｣ｱ`) UNION (SELECT * FROM `｣ﾔ｣ｱ`) UNION (SELECT * FROM `｣ﾔ｣ｲ`) ORDER BY `｣ﾃ｣ｱ`;
-SELECT `｣ﾃ｣ｱ`, COUNT(*) FROM `｣ﾔ｣ｱ` GROUP BY `｣ﾃ｣ｱ` UNION
-SELECT `｣ﾃ｣ｱ`, COUNT(*) FROM `｣ﾔ｣ｲ` GROUP BY `｣ﾃ｣ｱ` ORDER BY `｣ﾃ｣ｱ`;
-SELECT * FROM `｣ﾔ｣ｱ` UNION DISTINCT
-SELECT * FROM `｣ﾔ｣ｲ` UNION ALL
-SELECT * FROM `｣ﾔ｣ｳ` ORDER BY `｣ﾃ｣ｱ`;
-SELECT * FROM `｣ﾔ｣ｱ` UNION ALL
-SELECT * FROM `｣ﾔ｣ｲ` UNION DISTINCT
-SELECT * FROM `｣ﾔ｣ｳ` ORDER BY `｣ﾃ｣ｱ`;
-SELECT * FROM `｣ﾔ｣ｱ` UNION SELECT REPEAT(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｲ` ORDER BY `｣ﾃ｣ｱ`;
-DROP TABLE `｣ﾔ｣ｱ` ;
-DROP TABLE `｣ﾔ｣ｲ` ;
-DROP TABLE `｣ﾔ｣ｳ` ;
-
-#BDB
-CREATE TABLE `｣ﾔ｣ｱ` (`｣ﾃ｣ｱ` char(1), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = BDB; 
-CREATE TABLE `｣ﾔ｣ｲ` (`｣ﾃ｣ｱ` char(1), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = BDB;
-CREATE TABLE `｣ﾔ｣ｳ` (`｣ﾃ｣ｱ` char(1), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = BDB;
+#MEMORY
+CREATE TABLE `｣ﾔ｣ｱ` (`｣ﾃ｣ｱ` char(1), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `｣ﾔ｣ｲ` (`｣ﾃ｣ｱ` char(1), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `｣ﾔ｣ｳ` (`｣ﾃ｣ｱ` char(1), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = MEMORY;
 INSERT INTO `｣ﾔ｣ｱ` VALUES('竺'),('竺'),('､｢'),('､｢'),('常ﾜ'),('常ﾜ');
 INSERT INTO `｣ﾔ｣ｲ` VALUES('軸'),('軸'),('､､'),('､､'),('常ﾝ'),('常ﾝ');
 INSERT INTO `｣ﾔ｣ｳ` VALUES('宍'),('宍'),('､ｦ'),('､ｦ'),('常ﾞ'),('常ﾞ');