Added test data and test case files.

3 files changed, 144 insertions, 0 deletions

diff --git a/mysql-test/suite/jp/std_data/jisx0201_ucs2.dat b/mysql-test/suite/jp/std_data/jisx0201_ucs2.dat
new file mode 100755
index 00000000000..777f956a6cf
--- /dev/null
+++ b/mysql-test/suite/jp/std_data/jisx0201_ucs2.dat
diff --git a/mysql-test/suite/jp/std_data/jisx0208_sjis2.dat b/mysql-test/suite/jp/std_data/jisx0208_sjis2.dat
new file mode 100755
index 00000000000..d731cc0e3b2
--- /dev/null
+++ b/mysql-test/suite/jp/std_data/jisx0208_sjis2.dat
@@ -0,0 +1,2 @@
+ソ十表予構噂蚕申貼能暴禄曾箪兔喀媾彌拿杤
+
diff --git a/mysql-test/suite/jp/t/jp_subquery_ujis.test b/mysql-test/suite/jp/t/jp_subquery_ujis.test
new file mode 100755
index 00000000000..67c9f00fd85
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_subquery_ujis.test
@@ -0,0 +1,142 @@
+--source include/have_ujis.inc
+
+--disable_warnings
+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 `｣ﾔ｣ｱ｣ｲ`;
+--enable_warnings
+
+#
+# Test subquery using Japanese characters in ujis encoding 
+#
+
+SET NAMES ujis;
+SET character_set_database = ujis;
+
+CREATE TABLE `｣ﾔ｣ｱa` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｱb` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｲa` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｲb` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｳa` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｳb` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ujis engine = innodb;
+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 = myisam;
+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;
+
+#insert the following data in each table
+# jisx0201 hankaku-katakana data
+# jisx0208 data
+# jisx0212 supplemental character data
+
+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 ('､｢');
+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 ('竺');
+INSERT INTO `｣ﾔ｣ｱ｣ｱa` VALUES ('､｢'),('､ｫ'),('､ｵ');
+INSERT INTO `｣ﾔ｣ｱ｣ｱb` VALUES ('､｢');
+INSERT INTO `｣ﾔ｣ｱ｣ｲa` VALUES ('常ﾜ'),('常ﾝ'),('常ﾞ');
+INSERT INTO `｣ﾔ｣ｱ｣ｲb` VALUES ('常ﾜ');
+
+#Test for innodb
+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`.`｣ﾃ｣ｱ`);
+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`.`｣ﾃ｣ｱ`);
+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`.`｣ﾃ｣ｱ`);
+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`;
+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`;
+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`;
+DROP TABLE `｣ﾔ｣ｱ｣ｲa`;
+DROP TABLE `｣ﾔ｣ｱ｣ｲb`;
+