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

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

1 files changed, 272 insertions, 0 deletions

diff --git a/mysql-test/suite/jp/r/jp_enum_ujis.result b/mysql-test/suite/jp/r/jp_enum_ujis.result
new file mode 100644
index 00000000..8221c1c8
--- /dev/null
+++ b/mysql-test/suite/jp/r/jp_enum_ujis.result
@@ -0,0 +1,272 @@
+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 `｣ﾔ｣ｹ`;
+SET NAMES ujis;
+SET character_set_database = ujis;
+CREATE TABLE `｣ﾔ｣ｱ` (`｣ﾃ｣ｱ` ENUM('竺','軸','宍'), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｲ` (`｣ﾃ｣ｱ` ENUM('､｢','､､','､ｦ'), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｳ` (`｣ﾃ｣ｱ` ENUM('常ﾜ','常ﾝ','常ﾞ'), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = innodb;
+CREATE TABLE `｣ﾔ｣ｴ` (`｣ﾃ｣ｱ` ENUM('竺','軸','宍'), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `｣ﾔ｣ｵ` (`｣ﾃ｣ｱ` ENUM('､｢','､､','､ｦ'), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `｣ﾔ｣ｶ` (`｣ﾃ｣ｱ` ENUM('常ﾜ','常ﾝ','常ﾞ'), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = myisam;
+CREATE TABLE `｣ﾔ｣ｷ` (`｣ﾃ｣ｱ` ENUM('竺','軸','宍'), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `｣ﾔ｣ｸ` (`｣ﾃ｣ｱ` ENUM('､｢','､､','､ｦ'), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = MEMORY;
+CREATE TABLE `｣ﾔ｣ｹ` (`｣ﾃ｣ｱ` ENUM('常ﾜ','常ﾝ','常ﾞ'), INDEX(`｣ﾃ｣ｱ`)) DEFAULT CHARSET = ujis engine = MEMORY;
+INSERT INTO `｣ﾔ｣ｱ` VALUES ('竺'),('軸'),('宍');
+INSERT INTO `｣ﾔ｣ｲ` VALUES ('､｢'),('､､'),('､ｦ');
+INSERT INTO `｣ﾔ｣ｳ` VALUES ('常ﾜ'),('常ﾝ'),('常ﾞ');
+INSERT INTO `｣ﾔ｣ｴ` VALUES ('竺'),('軸'),('宍');
+INSERT INTO `｣ﾔ｣ｵ` VALUES ('､｢'),('､､'),('､ｦ');
+INSERT INTO `｣ﾔ｣ｶ` VALUES ('常ﾜ'),('常ﾝ'),('常ﾞ');
+INSERT INTO `｣ﾔ｣ｷ` VALUES ('竺'),('軸'),('宍');
+INSERT INTO `｣ﾔ｣ｸ` VALUES ('､｢'),('､､'),('､ｦ');
+INSERT INTO `｣ﾔ｣ｹ` VALUES ('常ﾜ'),('常ﾝ'),('常ﾞ');
+SELECT * FROM `｣ﾔ｣ｱ`;
+｣ﾃ｣ｱ
+竺
+軸
+宍
+SELECT * FROM `｣ﾔ｣ｲ`;
+｣ﾃ｣ｱ
+､｢
+､､
+､ｦ
+SELECT * FROM `｣ﾔ｣ｳ`;
+｣ﾃ｣ｱ
+常ﾜ
+常ﾝ
+常ﾞ
+SELECT * FROM `｣ﾔ｣ｴ`;
+｣ﾃ｣ｱ
+竺
+軸
+宍
+SELECT * FROM `｣ﾔ｣ｵ`;
+｣ﾃ｣ｱ
+､｢
+､､
+､ｦ
+SELECT * FROM `｣ﾔ｣ｶ`;
+｣ﾃ｣ｱ
+常ﾜ
+常ﾝ
+常ﾞ
+SELECT * FROM `｣ﾔ｣ｷ`;
+｣ﾃ｣ｱ
+竺
+軸
+宍
+SELECT * FROM `｣ﾔ｣ｸ`;
+｣ﾃ｣ｱ
+､｢
+､､
+､ｦ
+SELECT * FROM `｣ﾔ｣ｹ`;
+｣ﾃ｣ｱ
+常ﾜ
+常ﾝ
+常ﾞ
+SHOW CREATE TABLE `｣ﾔ｣ｱ`;
+Table	Create Table
+｣ﾔ｣ｱ	CREATE TABLE `｣ﾔ｣ｱ` (
+  `｣ﾃ｣ｱ` enum('竺','軸','宍') DEFAULT NULL,
+  KEY `｣ﾃ｣ｱ` (`｣ﾃ｣ｱ`)
+) ENGINE=InnoDB DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
+SHOW CREATE TABLE `｣ﾔ｣ｲ`;
+Table	Create Table
+｣ﾔ｣ｲ	CREATE TABLE `｣ﾔ｣ｲ` (
+  `｣ﾃ｣ｱ` enum('､｢','､､','､ｦ') DEFAULT NULL,
+  KEY `｣ﾃ｣ｱ` (`｣ﾃ｣ｱ`)
+) ENGINE=InnoDB DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
+SHOW CREATE TABLE `｣ﾔ｣ｳ`;
+Table	Create Table
+｣ﾔ｣ｳ	CREATE TABLE `｣ﾔ｣ｳ` (
+  `｣ﾃ｣ｱ` enum('常ﾜ','常ﾝ','常ﾞ') DEFAULT NULL,
+  KEY `｣ﾃ｣ｱ` (`｣ﾃ｣ｱ`)
+) ENGINE=InnoDB DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
+SHOW CREATE TABLE `｣ﾔ｣ｴ`;
+Table	Create Table
+｣ﾔ｣ｴ	CREATE TABLE `｣ﾔ｣ｴ` (
+  `｣ﾃ｣ｱ` enum('竺','軸','宍') DEFAULT NULL,
+  KEY `｣ﾃ｣ｱ` (`｣ﾃ｣ｱ`)
+) ENGINE=MyISAM DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
+SHOW CREATE TABLE `｣ﾔ｣ｵ`;
+Table	Create Table
+｣ﾔ｣ｵ	CREATE TABLE `｣ﾔ｣ｵ` (
+  `｣ﾃ｣ｱ` enum('､｢','､､','､ｦ') DEFAULT NULL,
+  KEY `｣ﾃ｣ｱ` (`｣ﾃ｣ｱ`)
+) ENGINE=MyISAM DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
+SHOW CREATE TABLE `｣ﾔ｣ｶ`;
+Table	Create Table
+｣ﾔ｣ｶ	CREATE TABLE `｣ﾔ｣ｶ` (
+  `｣ﾃ｣ｱ` enum('常ﾜ','常ﾝ','常ﾞ') DEFAULT NULL,
+  KEY `｣ﾃ｣ｱ` (`｣ﾃ｣ｱ`)
+) ENGINE=MyISAM DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
+SHOW CREATE TABLE `｣ﾔ｣ｷ`;
+Table	Create Table
+｣ﾔ｣ｷ	CREATE TABLE `｣ﾔ｣ｷ` (
+  `｣ﾃ｣ｱ` enum('竺','軸','宍') DEFAULT NULL,
+  KEY `｣ﾃ｣ｱ` (`｣ﾃ｣ｱ`)
+) ENGINE=MEMORY DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
+SHOW CREATE TABLE `｣ﾔ｣ｸ`;
+Table	Create Table
+｣ﾔ｣ｸ	CREATE TABLE `｣ﾔ｣ｸ` (
+  `｣ﾃ｣ｱ` enum('､｢','､､','､ｦ') DEFAULT NULL,
+  KEY `｣ﾃ｣ｱ` (`｣ﾃ｣ｱ`)
+) ENGINE=MEMORY DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
+SHOW CREATE TABLE `｣ﾔ｣ｹ`;
+Table	Create Table
+｣ﾔ｣ｹ	CREATE TABLE `｣ﾔ｣ｹ` (
+  `｣ﾃ｣ｱ` enum('常ﾜ','常ﾝ','常ﾞ') DEFAULT NULL,
+  KEY `｣ﾃ｣ｱ` (`｣ﾃ｣ｱ`)
+) ENGINE=MEMORY DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
+DESC `｣ﾔ｣ｱ`;
+Field	Type	Null	Key	Default	Extra
+｣ﾃ｣ｱ	enum('竺','軸','宍')	YES	MUL	NULL	
+DESC `｣ﾔ｣ｲ`;
+Field	Type	Null	Key	Default	Extra
+｣ﾃ｣ｱ	enum('､｢','､､','､ｦ')	YES	MUL	NULL	
+DESC `｣ﾔ｣ｳ`;
+Field	Type	Null	Key	Default	Extra
+｣ﾃ｣ｱ	enum('常ﾜ','常ﾝ','常ﾞ')	YES	MUL	NULL	
+DESC `｣ﾔ｣ｴ`;
+Field	Type	Null	Key	Default	Extra
+｣ﾃ｣ｱ	enum('竺','軸','宍')	YES	MUL	NULL	
+DESC `｣ﾔ｣ｵ`;
+Field	Type	Null	Key	Default	Extra
+｣ﾃ｣ｱ	enum('､｢','､､','､ｦ')	YES	MUL	NULL	
+DESC `｣ﾔ｣ｶ`;
+Field	Type	Null	Key	Default	Extra
+｣ﾃ｣ｱ	enum('常ﾜ','常ﾝ','常ﾞ')	YES	MUL	NULL	
+DESC `｣ﾔ｣ｷ`;
+Field	Type	Null	Key	Default	Extra
+｣ﾃ｣ｱ	enum('竺','軸','宍')	YES	MUL	NULL	
+DESC `｣ﾔ｣ｸ`;
+Field	Type	Null	Key	Default	Extra
+｣ﾃ｣ｱ	enum('､｢','､､','､ｦ')	YES	MUL	NULL	
+DESC `｣ﾔ｣ｹ`;
+Field	Type	Null	Key	Default	Extra
+｣ﾃ｣ｱ	enum('常ﾜ','常ﾝ','常ﾞ')	YES	MUL	NULL	
+ALTER TABLE `｣ﾔ｣ｱ` ADD `｣ﾃ｣ｲ` CHAR(1) NOT NULL FIRST;
+ALTER TABLE `｣ﾔ｣ｲ` ADD `｣ﾃ｣ｲ` CHAR(1) NOT NULL FIRST;
+ALTER TABLE `｣ﾔ｣ｳ` ADD `｣ﾃ｣ｲ` CHAR(1) NOT NULL FIRST;
+ALTER TABLE `｣ﾔ｣ｴ` ADD `｣ﾃ｣ｲ` CHAR(1) NOT NULL FIRST;
+ALTER TABLE `｣ﾔ｣ｵ` ADD `｣ﾃ｣ｲ` CHAR(1) NOT NULL FIRST;
+ALTER TABLE `｣ﾔ｣ｶ` ADD `｣ﾃ｣ｲ` CHAR(1) NOT NULL FIRST;
+ALTER TABLE `｣ﾔ｣ｷ` ADD `｣ﾃ｣ｲ` CHAR(1) NOT NULL FIRST;
+ALTER TABLE `｣ﾔ｣ｸ` ADD `｣ﾃ｣ｲ` CHAR(1) NOT NULL FIRST;
+ALTER TABLE `｣ﾔ｣ｹ` ADD `｣ﾃ｣ｲ` CHAR(1) NOT NULL FIRST;
+SHOW CREATE TABLE `｣ﾔ｣ｱ`;
+Table	Create Table
+｣ﾔ｣ｱ	CREATE TABLE `｣ﾔ｣ｱ` (
+  `｣ﾃ｣ｲ` char(1) NOT NULL,
+  `｣ﾃ｣ｱ` enum('竺','軸','宍') DEFAULT NULL,
+  KEY `｣ﾃ｣ｱ` (`｣ﾃ｣ｱ`)
+) ENGINE=InnoDB DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
+SHOW CREATE TABLE `｣ﾔ｣ｲ`;
+Table	Create Table
+｣ﾔ｣ｲ	CREATE TABLE `｣ﾔ｣ｲ` (
+  `｣ﾃ｣ｲ` char(1) NOT NULL,
+  `｣ﾃ｣ｱ` enum('､｢','､､','､ｦ') DEFAULT NULL,
+  KEY `｣ﾃ｣ｱ` (`｣ﾃ｣ｱ`)
+) ENGINE=InnoDB DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
+SHOW CREATE TABLE `｣ﾔ｣ｳ`;
+Table	Create Table
+｣ﾔ｣ｳ	CREATE TABLE `｣ﾔ｣ｳ` (
+  `｣ﾃ｣ｲ` char(1) NOT NULL,
+  `｣ﾃ｣ｱ` enum('常ﾜ','常ﾝ','常ﾞ') DEFAULT NULL,
+  KEY `｣ﾃ｣ｱ` (`｣ﾃ｣ｱ`)
+) ENGINE=InnoDB DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
+SHOW CREATE TABLE `｣ﾔ｣ｴ`;
+Table	Create Table
+｣ﾔ｣ｴ	CREATE TABLE `｣ﾔ｣ｴ` (
+  `｣ﾃ｣ｲ` char(1) NOT NULL,
+  `｣ﾃ｣ｱ` enum('竺','軸','宍') DEFAULT NULL,
+  KEY `｣ﾃ｣ｱ` (`｣ﾃ｣ｱ`)
+) ENGINE=MyISAM DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
+SHOW CREATE TABLE `｣ﾔ｣ｵ`;
+Table	Create Table
+｣ﾔ｣ｵ	CREATE TABLE `｣ﾔ｣ｵ` (
+  `｣ﾃ｣ｲ` char(1) NOT NULL,
+  `｣ﾃ｣ｱ` enum('､｢','､､','､ｦ') DEFAULT NULL,
+  KEY `｣ﾃ｣ｱ` (`｣ﾃ｣ｱ`)
+) ENGINE=MyISAM DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
+SHOW CREATE TABLE `｣ﾔ｣ｶ`;
+Table	Create Table
+｣ﾔ｣ｶ	CREATE TABLE `｣ﾔ｣ｶ` (
+  `｣ﾃ｣ｲ` char(1) NOT NULL,
+  `｣ﾃ｣ｱ` enum('常ﾜ','常ﾝ','常ﾞ') DEFAULT NULL,
+  KEY `｣ﾃ｣ｱ` (`｣ﾃ｣ｱ`)
+) ENGINE=MyISAM DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
+SHOW CREATE TABLE `｣ﾔ｣ｷ`;
+Table	Create Table
+｣ﾔ｣ｷ	CREATE TABLE `｣ﾔ｣ｷ` (
+  `｣ﾃ｣ｲ` char(1) NOT NULL,
+  `｣ﾃ｣ｱ` enum('竺','軸','宍') DEFAULT NULL,
+  KEY `｣ﾃ｣ｱ` (`｣ﾃ｣ｱ`)
+) ENGINE=MEMORY DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
+SHOW CREATE TABLE `｣ﾔ｣ｸ`;
+Table	Create Table
+｣ﾔ｣ｸ	CREATE TABLE `｣ﾔ｣ｸ` (
+  `｣ﾃ｣ｲ` char(1) NOT NULL,
+  `｣ﾃ｣ｱ` enum('､｢','､､','､ｦ') DEFAULT NULL,
+  KEY `｣ﾃ｣ｱ` (`｣ﾃ｣ｱ`)
+) ENGINE=MEMORY DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
+SHOW CREATE TABLE `｣ﾔ｣ｹ`;
+Table	Create Table
+｣ﾔ｣ｹ	CREATE TABLE `｣ﾔ｣ｹ` (
+  `｣ﾃ｣ｲ` char(1) NOT NULL,
+  `｣ﾃ｣ｱ` enum('常ﾜ','常ﾝ','常ﾞ') DEFAULT NULL,
+  KEY `｣ﾃ｣ｱ` (`｣ﾃ｣ｱ`)
+) ENGINE=MEMORY DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
+DESC `｣ﾔ｣ｱ`;
+Field	Type	Null	Key	Default	Extra
+｣ﾃ｣ｲ	char(1)	NO		NULL	
+｣ﾃ｣ｱ	enum('竺','軸','宍')	YES	MUL	NULL	
+DESC `｣ﾔ｣ｲ`;
+Field	Type	Null	Key	Default	Extra
+｣ﾃ｣ｲ	char(1)	NO		NULL	
+｣ﾃ｣ｱ	enum('､｢','､､','､ｦ')	YES	MUL	NULL	
+DESC `｣ﾔ｣ｳ`;
+Field	Type	Null	Key	Default	Extra
+｣ﾃ｣ｲ	char(1)	NO		NULL	
+｣ﾃ｣ｱ	enum('常ﾜ','常ﾝ','常ﾞ')	YES	MUL	NULL	
+DESC `｣ﾔ｣ｴ`;
+Field	Type	Null	Key	Default	Extra
+｣ﾃ｣ｲ	char(1)	NO		NULL	
+｣ﾃ｣ｱ	enum('竺','軸','宍')	YES	MUL	NULL	
+DESC `｣ﾔ｣ｵ`;
+Field	Type	Null	Key	Default	Extra
+｣ﾃ｣ｲ	char(1)	NO		NULL	
+｣ﾃ｣ｱ	enum('､｢','､､','､ｦ')	YES	MUL	NULL	
+DESC `｣ﾔ｣ｶ`;
+Field	Type	Null	Key	Default	Extra
+｣ﾃ｣ｲ	char(1)	NO		NULL	
+｣ﾃ｣ｱ	enum('常ﾜ','常ﾝ','常ﾞ')	YES	MUL	NULL	
+DESC `｣ﾔ｣ｷ`;
+Field	Type	Null	Key	Default	Extra
+｣ﾃ｣ｲ	char(1)	NO		NULL	
+｣ﾃ｣ｱ	enum('竺','軸','宍')	YES	MUL	NULL	
+DESC `｣ﾔ｣ｸ`;
+Field	Type	Null	Key	Default	Extra
+｣ﾃ｣ｲ	char(1)	NO		NULL	
+｣ﾃ｣ｱ	enum('､｢','､､','､ｦ')	YES	MUL	NULL	
+DESC `｣ﾔ｣ｹ`;
+Field	Type	Null	Key	Default	Extra
+｣ﾃ｣ｲ	char(1)	NO		NULL	
+｣ﾃ｣ｱ	enum('常ﾜ','常ﾝ','常ﾞ')	YES	MUL	NULL	
+DROP TABLE `｣ﾔ｣ｱ`;
+DROP TABLE `｣ﾔ｣ｲ`;
+DROP TABLE `｣ﾔ｣ｳ`;
+DROP TABLE `｣ﾔ｣ｴ`;
+DROP TABLE `｣ﾔ｣ｵ`;
+DROP TABLE `｣ﾔ｣ｶ`;
+DROP TABLE `｣ﾔ｣ｷ`;
+DROP TABLE `｣ﾔ｣ｸ`;
+DROP TABLE `｣ﾔ｣ｹ`;