Adding upstream version 1:10.11.6.upstream/1%10.11.6upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 164 insertions, 0 deletions

diff --git a/mysql-test/suite/jp/r/jp_subquery_ujis.result b/mysql-test/suite/jp/r/jp_subquery_ujis.result
new file mode 100644
index 00000000..530f7e1a
--- /dev/null
+++ b/mysql-test/suite/jp/r/jp_subquery_ujis.result
@@ -0,0 +1,164 @@
+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;
+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 = 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 ('､｢'),('､ｫ'),('､ｵ');
+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 ('常ﾜ');
+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`;