1 files changed, 3 insertions, 101 deletions

diff --git a/mysql-test/suite/jp/r/jp_union_ujis.result b/mysql-test/suite/jp/r/jp_union_ujis.result
index 4b74c570ffe..00dc868b8e2 100644
--- a/mysql-test/suite/jp/r/jp_union_ujis.result
+++ b/mysql-test/suite/jp/r/jp_union_ujis.result
@@ -7,9 +7,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 `｣ﾔ｣ｱ｣ｲ`;
 SET NAMES ujis;
 SET character_set_database = ujis;
 CREATE TABLE `｣ﾔ｣ｱ` (`｣ﾃ｣ｱ` char(1), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = innodb;
@@ -202,104 +199,9 @@ SELECT * FROM `｣ﾔ｣ｱ` UNION SELECT REPEAT(`｣ﾃ｣ｱ`,5) FROM `｣ﾔ｣ｲ` ORDER BY `｣ﾃ｣ｱ`;
 DROP TABLE `｣ﾔ｣ｱ` ;
 DROP TABLE `｣ﾔ｣ｲ` ;
 DROP TABLE `｣ﾔ｣ｳ` ;
-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 `｣ﾃ｣ｱ`;
-｣ﾃ｣ｱ	COUNT(*)
-竺	2
-軸	2
-常ﾜ	2
-常ﾝ	2
-､｢	2
-､､	2
-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 `｣ﾔ｣ｳ` ;
-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;
+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('宍'),('宍'),('､ｦ'),('､ｦ'),('常ﾞ'),('常ﾞ');