1 files changed, 24 insertions, 66 deletions

diff --git a/mysql-test/suite/jp/r/jp_subquery_ujis.result b/mysql-test/suite/jp/r/jp_subquery_ujis.result
index 0b6aa03970f..530f7e1ad9f 100644
--- a/mysql-test/suite/jp/r/jp_subquery_ujis.result
+++ b/mysql-test/suite/jp/r/jp_subquery_ujis.result
@@ -1,15 +1,21 @@
-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 `｣ﾔ｣ｷ`;
-drop table if exists `｣ﾔ｣ｸ`;
-drop table if exists `｣ﾔ｣ｹ`;
-drop table if exists `｣ﾔ｣ｱ｣ｰ`;
-drop table if exists `｣ﾔ｣ｱ｣ｱ`;
-drop table if exists `｣ﾔ｣ｱ｣ｲ`;
+DROP TABLE IF EXISTS `｣ﾔ｣ｱa`;
+DROP TABLE IF EXISTS `｣ﾔ｣ｱb`;
+DROP TABLE IF EXISTS `｣ﾔ｣ｲa`;
+DROP TABLE IF EXISTS `｣ﾔ｣ｲb`;
+DROP TABLE IF EXISTS `｣ﾔ｣ｳa`;
+DROP TABLE IF EXISTS `｣ﾔ｣ｳb`;
+DROP TABLE IF EXISTS `｣ﾔ｣ｴa`;
+DROP TABLE IF EXISTS `｣ﾔ｣ｴb`;
+DROP TABLE IF EXISTS `｣ﾔ｣ｵa`;
+DROP TABLE IF EXISTS `｣ﾔ｣ｵb`;
+DROP TABLE IF EXISTS `｣ﾔ｣ｶa`;
+DROP TABLE IF EXISTS `｣ﾔ｣ｶb`;
+DROP TABLE IF EXISTS `｣ﾔ｣ｷa`;
+DROP TABLE IF EXISTS `｣ﾔ｣ｷb`;
+DROP TABLE IF EXISTS `｣ﾔ｣ｸa`;
+DROP TABLE IF EXISTS `｣ﾔ｣ｸb`;
+DROP TABLE IF EXISTS `｣ﾔ｣ｹa`;
+DROP TABLE IF EXISTS `｣ﾔ｣ｹb`;
 SET NAMES ujis;
 SET character_set_database = ujis;
 CREATE TABLE `｣ﾔ｣ｱa` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
@@ -24,18 +30,12 @@ CREATE TABLE `｣ﾔ｣ｵa` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine
 CREATE TABLE `｣ﾔ｣ｵb` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `｣ﾔ｣ｶa` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = myisam;
 CREATE TABLE `｣ﾔ｣ｶb` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = myisam;
-CREATE TABLE `｣ﾔ｣ｷa` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `｣ﾔ｣ｷb` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `｣ﾔ｣ｸa` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `｣ﾔ｣ｸb` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `｣ﾔ｣ｹa` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `｣ﾔ｣ｹb` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `｣ﾔ｣ｱ｣ｰa` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `｣ﾔ｣ｱ｣ｰb` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `｣ﾔ｣ｱ｣ｱa` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `｣ﾔ｣ｱ｣ｱb` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `｣ﾔ｣ｱ｣ｲa` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = heap;
-CREATE TABLE `｣ﾔ｣ｱ｣ｲb` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = heap;
+CREATE TABLE `｣ﾔ｣ｷa` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `｣ﾔ｣ｷb` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `｣ﾔ｣ｸa` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `｣ﾔ｣ｸb` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `｣ﾔ｣ｹa` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `｣ﾔ｣ｹb` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = MEMORY;
 INSERT INTO `｣ﾔ｣ｱa` VALUES ('竺'),('叱'),('悉');
 INSERT INTO `｣ﾔ｣ｱb` VALUES ('竺');
 INSERT INTO `｣ﾔ｣ｲa` VALUES ('､｢'),('､ｫ'),('､ｵ');
@@ -54,12 +54,6 @@ INSERT INTO `｣ﾔ｣ｸa` VALUES ('､｢'),('､ｫ'),('､ｵ');
 INSERT INTO `｣ﾔ｣ｸb` VALUES ('､｢');
 INSERT INTO `｣ﾔ｣ｹa` VALUES ('常ﾜ'),('常ﾝ'),('常ﾞ');
 INSERT INTO `｣ﾔ｣ｹb` VALUES ('常ﾜ');
-INSERT INTO `｣ﾔ｣ｱ｣ｰa` VALUES ('竺'),('叱'),('悉');
-INSERT INTO `｣ﾔ｣ｱ｣ｰb` VALUES ('竺');
-INSERT INTO `｣ﾔ｣ｱ｣ｱa` VALUES ('､｢'),('､ｫ'),('､ｵ');
-INSERT INTO `｣ﾔ｣ｱ｣ｱb` VALUES ('､｢');
-INSERT INTO `｣ﾔ｣ｱ｣ｲa` VALUES ('常ﾜ'),('常ﾝ'),('常ﾞ');
-INSERT INTO `｣ﾔ｣ｱ｣ｲb` VALUES ('常ﾜ');
 SELECT `｣ﾃ｣ｱ` FROM `｣ﾔ｣ｱa` WHERE `｣ﾃ｣ｱ` IN (SELECT `｣ﾃ｣ｱ` FROM `｣ﾔ｣ｱb`);
 ｣ﾃ｣ｱ
 竺
@@ -150,36 +144,6 @@ SELECT `｣ﾃ｣ｱ` FROM `｣ﾔ｣ｹa` WHERE NOT EXISTS (SELECT `｣ﾃ｣ｱ` FROM `｣ﾔ｣ｹb` WHERE `｣
 ｣ﾃ｣ｱ
 常ﾝ
 常ﾞ
-SELECT `｣ﾃ｣ｱ` FROM `｣ﾔ｣ｱ｣ｰa` WHERE `｣ﾃ｣ｱ` IN (SELECT `｣ﾃ｣ｱ` FROM `｣ﾔ｣ｱ｣ｰb`);
-｣ﾃ｣ｱ
-竺
-SELECT `｣ﾃ｣ｱ` FROM `｣ﾔ｣ｱ｣ｰa` WHERE EXISTS (SELECT `｣ﾃ｣ｱ` FROM `｣ﾔ｣ｱ｣ｰb` WHERE `｣ﾔ｣ｱ｣ｰa`.`｣ﾃ｣ｱ` = `｣ﾔ｣ｱ｣ｰb`.`｣ﾃ｣ｱ`);
-｣ﾃ｣ｱ
-竺
-SELECT `｣ﾃ｣ｱ` FROM `｣ﾔ｣ｱ｣ｰa` WHERE NOT EXISTS (SELECT `｣ﾃ｣ｱ` FROM `｣ﾔ｣ｱ｣ｰb` WHERE `｣ﾔ｣ｱ｣ｰa`.`｣ﾃ｣ｱ` = `｣ﾔ｣ｱ｣ｰb`.`｣ﾃ｣ｱ`);
-｣ﾃ｣ｱ
-叱
-悉
-SELECT `｣ﾃ｣ｱ` FROM `｣ﾔ｣ｱ｣ｱa` WHERE `｣ﾃ｣ｱ` IN (SELECT `｣ﾃ｣ｱ` FROM `｣ﾔ｣ｱ｣ｱb`);
-｣ﾃ｣ｱ
-､｢
-SELECT `｣ﾃ｣ｱ` FROM `｣ﾔ｣ｱ｣ｱa` WHERE EXISTS (SELECT `｣ﾃ｣ｱ` FROM `｣ﾔ｣ｱ｣ｱb` WHERE `｣ﾔ｣ｱ｣ｱa`.`｣ﾃ｣ｱ` = `｣ﾔ｣ｱ｣ｱb`.`｣ﾃ｣ｱ`);
-｣ﾃ｣ｱ
-､｢
-SELECT `｣ﾃ｣ｱ` FROM `｣ﾔ｣ｱ｣ｱa` WHERE NOT EXISTS (SELECT `｣ﾃ｣ｱ` FROM `｣ﾔ｣ｱ｣ｱb` WHERE `｣ﾔ｣ｱ｣ｱa`.`｣ﾃ｣ｱ` = `｣ﾔ｣ｱ｣ｱb`.`｣ﾃ｣ｱ`);
-｣ﾃ｣ｱ
-､ｫ
-､ｵ
-SELECT `｣ﾃ｣ｱ` FROM `｣ﾔ｣ｱ｣ｲa` WHERE `｣ﾃ｣ｱ` IN (SELECT `｣ﾃ｣ｱ` FROM `｣ﾔ｣ｱ｣ｲb`);
-｣ﾃ｣ｱ
-常ﾜ
-SELECT `｣ﾃ｣ｱ` FROM `｣ﾔ｣ｱ｣ｲa` WHERE EXISTS (SELECT `｣ﾃ｣ｱ` FROM `｣ﾔ｣ｱ｣ｲb` WHERE `｣ﾔ｣ｱ｣ｲa`.`｣ﾃ｣ｱ` = `｣ﾔ｣ｱ｣ｲb`.`｣ﾃ｣ｱ`);
-｣ﾃ｣ｱ
-常ﾜ
-SELECT `｣ﾃ｣ｱ` FROM `｣ﾔ｣ｱ｣ｲa` WHERE NOT EXISTS (SELECT `｣ﾃ｣ｱ` FROM `｣ﾔ｣ｱ｣ｲb` WHERE `｣ﾔ｣ｱ｣ｲa`.`｣ﾃ｣ｱ` = `｣ﾔ｣ｱ｣ｲb`.`｣ﾃ｣ｱ`);
-｣ﾃ｣ｱ
-常ﾝ
-常ﾞ
 DROP TABLE `｣ﾔ｣ｱa`;
 DROP TABLE `｣ﾔ｣ｱb`;
 DROP TABLE `｣ﾔ｣ｲa`;
@@ -198,9 +162,3 @@ DROP TABLE `｣ﾔ｣ｸa`;
 DROP TABLE `｣ﾔ｣ｸb`;
 DROP TABLE `｣ﾔ｣ｹa`;
 DROP TABLE `｣ﾔ｣ｹb`;
-DROP TABLE `｣ﾔ｣ｱ｣ｰa`;
-DROP TABLE `｣ﾔ｣ｱ｣ｰb`;
-DROP TABLE `｣ﾔ｣ｱ｣ｱa`;
-DROP TABLE `｣ﾔ｣ｱ｣ｱb`;
-DROP TABLE `｣ﾔ｣ｱ｣ｲa`;
-DROP TABLE `｣ﾔ｣ｱ｣ｲb`;