1 files changed, 180 insertions, 0 deletions

diff --git a/mysql-test/suite/jp/t/jp_join_ucs2.test b/mysql-test/suite/jp/t/jp_join_ucs2.test
new file mode 100644
index 00000000..2c3a9c24
--- /dev/null
+++ b/mysql-test/suite/jp/t/jp_join_ucs2.test
@@ -0,0 +1,180 @@
+--source include/have_ucs2.inc
+--source include/have_innodb.inc
+
+--disable_warnings
+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`;
+--enable_warnings
+
+#
+# Test table JOIN using Japanese characters 
+#
+
+SET NAMES ujis;
+SET character_set_database = ucs2;
+SET collation_connection = ucs2_general_ci;
+
+CREATE TABLE `｣ﾔ｣ｱa` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｱb` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｲa` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｲb` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｳa` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｳb` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = innodb;
+CREATE TABLE `｣ﾔ｣ｴa` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MyISAM;
+CREATE TABLE `｣ﾔ｣ｴb` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MyISAM;
+CREATE TABLE `｣ﾔ｣ｵa` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MyISAM;
+CREATE TABLE `｣ﾔ｣ｵb` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MyISAM;
+CREATE TABLE `｣ﾔ｣ｶa` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MyISAM;
+CREATE TABLE `｣ﾔ｣ｶb` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MyISAM;
+CREATE TABLE `｣ﾔ｣ｷa` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `｣ﾔ｣ｷb` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `｣ﾔ｣ｸa` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `｣ﾔ｣ｸb` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `｣ﾔ｣ｹa` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MEMORY;
+CREATE TABLE `｣ﾔ｣ｹb` (`｣ﾃ｣ｱ` char(1) PRIMARY KEY) DEFAULT CHARSET = ucs2 engine = MEMORY;
+
+#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 ('常ﾜ');
+
+#Test for innodb
+SELECT * FROM `｣ﾔ｣ｱa` JOIN `｣ﾔ｣ｱb`;
+SELECT * FROM `｣ﾔ｣ｱa` INNER JOIN `｣ﾔ｣ｱb`;
+SELECT * FROM `｣ﾔ｣ｱa` JOIN `｣ﾔ｣ｱb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｱa` INNER JOIN `｣ﾔ｣ｱb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｱa` CROSS JOIN `｣ﾔ｣ｱb`;
+SELECT * FROM `｣ﾔ｣ｱa` LEFT JOIN `｣ﾔ｣ｱb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｱa` LEFT JOIN `｣ﾔ｣ｱb` ON (`｣ﾔ｣ｱa`.`｣ﾃ｣ｱ` = `｣ﾔ｣ｱb`.`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｱb` RIGHT JOIN `｣ﾔ｣ｱa` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｱb` RIGHT JOIN `｣ﾔ｣ｱa` ON (`｣ﾔ｣ｱa`.`｣ﾃ｣ｱ` = `｣ﾔ｣ｱb`.`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｲa` JOIN `｣ﾔ｣ｲb`;
+SELECT * FROM `｣ﾔ｣ｲa` INNER JOIN `｣ﾔ｣ｲb`;
+SELECT * FROM `｣ﾔ｣ｲa` JOIN `｣ﾔ｣ｲb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｲa` INNER JOIN `｣ﾔ｣ｲb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｲa` CROSS JOIN `｣ﾔ｣ｲb`;
+SELECT * FROM `｣ﾔ｣ｲa` LEFT JOIN `｣ﾔ｣ｲb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｲa` LEFT JOIN `｣ﾔ｣ｲb` ON (`｣ﾔ｣ｲa`.`｣ﾃ｣ｱ` = `｣ﾔ｣ｲb`.`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｲb` RIGHT JOIN `｣ﾔ｣ｲa` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｲb` RIGHT JOIN `｣ﾔ｣ｲa` ON (`｣ﾔ｣ｲa`.`｣ﾃ｣ｱ` = `｣ﾔ｣ｲb`.`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｳa` JOIN `｣ﾔ｣ｳb`;
+SELECT * FROM `｣ﾔ｣ｳa` INNER JOIN `｣ﾔ｣ｳb`;
+SELECT * FROM `｣ﾔ｣ｳa` JOIN `｣ﾔ｣ｳb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｳa` INNER JOIN `｣ﾔ｣ｳb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｳa` CROSS JOIN `｣ﾔ｣ｳb`;
+SELECT * FROM `｣ﾔ｣ｳa` LEFT JOIN `｣ﾔ｣ｳb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｳa` LEFT JOIN `｣ﾔ｣ｳb` ON (`｣ﾔ｣ｳa`.`｣ﾃ｣ｱ` = `｣ﾔ｣ｳb`.`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｳb` RIGHT JOIN `｣ﾔ｣ｳa` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｳb` RIGHT JOIN `｣ﾔ｣ｳa` ON (`｣ﾔ｣ｳa`.`｣ﾃ｣ｱ` = `｣ﾔ｣ｳb`.`｣ﾃ｣ｱ`);
+
+#Test for myisam
+SELECT * FROM `｣ﾔ｣ｴa` JOIN `｣ﾔ｣ｴb`;
+SELECT * FROM `｣ﾔ｣ｴa` INNER JOIN `｣ﾔ｣ｴb`;
+SELECT * FROM `｣ﾔ｣ｴa` JOIN `｣ﾔ｣ｴb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｴa` INNER JOIN `｣ﾔ｣ｴb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｴa` CROSS JOIN `｣ﾔ｣ｴb`;
+SELECT * FROM `｣ﾔ｣ｴa` LEFT JOIN `｣ﾔ｣ｴb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｴa` LEFT JOIN `｣ﾔ｣ｴb` ON (`｣ﾔ｣ｴa`.`｣ﾃ｣ｱ` = `｣ﾔ｣ｴb`.`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｴb` RIGHT JOIN `｣ﾔ｣ｴa` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｴb` RIGHT JOIN `｣ﾔ｣ｴa` ON (`｣ﾔ｣ｴa`.`｣ﾃ｣ｱ` = `｣ﾔ｣ｴb`.`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｵa` JOIN `｣ﾔ｣ｵb`;
+SELECT * FROM `｣ﾔ｣ｵa` INNER JOIN `｣ﾔ｣ｵb`;
+SELECT * FROM `｣ﾔ｣ｵa` JOIN `｣ﾔ｣ｵb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｵa` INNER JOIN `｣ﾔ｣ｵb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｵa` CROSS JOIN `｣ﾔ｣ｵb`;
+SELECT * FROM `｣ﾔ｣ｵa` LEFT JOIN `｣ﾔ｣ｵb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｵa` LEFT JOIN `｣ﾔ｣ｵb` ON (`｣ﾔ｣ｵa`.`｣ﾃ｣ｱ` = `｣ﾔ｣ｵb`.`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｵb` RIGHT JOIN `｣ﾔ｣ｵa` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｵb` RIGHT JOIN `｣ﾔ｣ｵa` ON (`｣ﾔ｣ｵa`.`｣ﾃ｣ｱ` = `｣ﾔ｣ｵb`.`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｶa` JOIN `｣ﾔ｣ｶb`;
+SELECT * FROM `｣ﾔ｣ｶa` INNER JOIN `｣ﾔ｣ｶb`;
+SELECT * FROM `｣ﾔ｣ｶa` JOIN `｣ﾔ｣ｶb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｶa` INNER JOIN `｣ﾔ｣ｶb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｶa` CROSS JOIN `｣ﾔ｣ｶb`;
+SELECT * FROM `｣ﾔ｣ｶa` LEFT JOIN `｣ﾔ｣ｶb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｶa` LEFT JOIN `｣ﾔ｣ｶb` ON (`｣ﾔ｣ｶa`.`｣ﾃ｣ｱ` = `｣ﾔ｣ｶb`.`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｶb` RIGHT JOIN `｣ﾔ｣ｶa` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｶb` RIGHT JOIN `｣ﾔ｣ｶa` ON (`｣ﾔ｣ｶa`.`｣ﾃ｣ｱ` = `｣ﾔ｣ｶb`.`｣ﾃ｣ｱ`);
+
+#Test for MEMORY
+SELECT * FROM `｣ﾔ｣ｷa` JOIN `｣ﾔ｣ｷb`;
+SELECT * FROM `｣ﾔ｣ｷa` INNER JOIN `｣ﾔ｣ｷb`;
+SELECT * FROM `｣ﾔ｣ｷa` JOIN `｣ﾔ｣ｷb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｷa` INNER JOIN `｣ﾔ｣ｷb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｷa` CROSS JOIN `｣ﾔ｣ｷb`;
+SELECT * FROM `｣ﾔ｣ｷa` LEFT JOIN `｣ﾔ｣ｷb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｷa` LEFT JOIN `｣ﾔ｣ｷb` ON (`｣ﾔ｣ｷa`.`｣ﾃ｣ｱ` = `｣ﾔ｣ｷb`.`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｷb` RIGHT JOIN `｣ﾔ｣ｷa` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｷb` RIGHT JOIN `｣ﾔ｣ｷa` ON (`｣ﾔ｣ｷa`.`｣ﾃ｣ｱ` = `｣ﾔ｣ｷb`.`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｸa` JOIN `｣ﾔ｣ｸb`;
+SELECT * FROM `｣ﾔ｣ｸa` INNER JOIN `｣ﾔ｣ｸb`;
+SELECT * FROM `｣ﾔ｣ｸa` JOIN `｣ﾔ｣ｸb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｸa` INNER JOIN `｣ﾔ｣ｸb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｸa` CROSS JOIN `｣ﾔ｣ｸb`;
+SELECT * FROM `｣ﾔ｣ｸa` LEFT JOIN `｣ﾔ｣ｸb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｸa` LEFT JOIN `｣ﾔ｣ｸb` ON (`｣ﾔ｣ｸa`.`｣ﾃ｣ｱ` = `｣ﾔ｣ｸb`.`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｸb` RIGHT JOIN `｣ﾔ｣ｸa` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｸb` RIGHT JOIN `｣ﾔ｣ｸa` ON (`｣ﾔ｣ｸa`.`｣ﾃ｣ｱ` = `｣ﾔ｣ｸb`.`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｹa` JOIN `｣ﾔ｣ｹb`;
+SELECT * FROM `｣ﾔ｣ｹa` INNER JOIN `｣ﾔ｣ｹb`;
+SELECT * FROM `｣ﾔ｣ｹa` JOIN `｣ﾔ｣ｹb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｹa` INNER JOIN `｣ﾔ｣ｹb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｹa` CROSS JOIN `｣ﾔ｣ｹb`;
+SELECT * FROM `｣ﾔ｣ｹa` LEFT JOIN `｣ﾔ｣ｹb` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｹa` LEFT JOIN `｣ﾔ｣ｹb` ON (`｣ﾔ｣ｹa`.`｣ﾃ｣ｱ` = `｣ﾔ｣ｹb`.`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｹb` RIGHT JOIN `｣ﾔ｣ｹa` USING (`｣ﾃ｣ｱ`);
+SELECT * FROM `｣ﾔ｣ｹb` RIGHT JOIN `｣ﾔ｣ｹa` ON (`｣ﾔ｣ｹ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`;