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, 272 insertions, 0 deletions

diff --git a/mysql-test/suite/jp/r/jp_enum_utf8.result b/mysql-test/suite/jp/r/jp_enum_utf8.result
new file mode 100644
index 00000000..c6e3567e
--- /dev/null
+++ b/mysql-test/suite/jp/r/jp_enum_utf8.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 utf8;
+SET character_set_database = utf8;
+CREATE TABLE `Ｔ１` (`Ｃ１` ENUM('ｱ','ｲ','ｳ'), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `Ｔ２` (`Ｃ１` ENUM('あ','い','う'), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `Ｔ３` (`Ｃ１` ENUM('龔','龖','龗'), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = innodb;
+CREATE TABLE `Ｔ４` (`Ｃ１` ENUM('ｱ','ｲ','ｳ'), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `Ｔ５` (`Ｃ１` ENUM('あ','い','う'), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `Ｔ６` (`Ｃ１` ENUM('龔','龖','龗'), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = myisam;
+CREATE TABLE `Ｔ７` (`Ｃ１` ENUM('ｱ','ｲ','ｳ'), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `Ｔ８` (`Ｃ１` ENUM('あ','い','う'), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 engine = MEMORY;
+CREATE TABLE `Ｔ９` (`Ｃ１` ENUM('龔','龖','龗'), INDEX(`Ｃ１`)) DEFAULT CHARSET = utf8 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=utf8mb3 COLLATE=utf8mb3_general_ci
+SHOW CREATE TABLE `Ｔ２`;
+Table	Create Table
+Ｔ２	CREATE TABLE `Ｔ２` (
+  `Ｃ１` enum('あ','い','う') DEFAULT NULL,
+  KEY `Ｃ１` (`Ｃ１`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
+SHOW CREATE TABLE `Ｔ３`;
+Table	Create Table
+Ｔ３	CREATE TABLE `Ｔ３` (
+  `Ｃ１` enum('龔','龖','龗') DEFAULT NULL,
+  KEY `Ｃ１` (`Ｃ１`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
+SHOW CREATE TABLE `Ｔ４`;
+Table	Create Table
+Ｔ４	CREATE TABLE `Ｔ４` (
+  `Ｃ１` enum('ｱ','ｲ','ｳ') DEFAULT NULL,
+  KEY `Ｃ１` (`Ｃ１`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
+SHOW CREATE TABLE `Ｔ５`;
+Table	Create Table
+Ｔ５	CREATE TABLE `Ｔ５` (
+  `Ｃ１` enum('あ','い','う') DEFAULT NULL,
+  KEY `Ｃ１` (`Ｃ１`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
+SHOW CREATE TABLE `Ｔ６`;
+Table	Create Table
+Ｔ６	CREATE TABLE `Ｔ６` (
+  `Ｃ１` enum('龔','龖','龗') DEFAULT NULL,
+  KEY `Ｃ１` (`Ｃ１`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
+SHOW CREATE TABLE `Ｔ７`;
+Table	Create Table
+Ｔ７	CREATE TABLE `Ｔ７` (
+  `Ｃ１` enum('ｱ','ｲ','ｳ') DEFAULT NULL,
+  KEY `Ｃ１` (`Ｃ１`)
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
+SHOW CREATE TABLE `Ｔ８`;
+Table	Create Table
+Ｔ８	CREATE TABLE `Ｔ８` (
+  `Ｃ１` enum('あ','い','う') DEFAULT NULL,
+  KEY `Ｃ１` (`Ｃ１`)
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
+SHOW CREATE TABLE `Ｔ９`;
+Table	Create Table
+Ｔ９	CREATE TABLE `Ｔ９` (
+  `Ｃ１` enum('龔','龖','龗') DEFAULT NULL,
+  KEY `Ｃ１` (`Ｃ１`)
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_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=utf8mb3 COLLATE=utf8mb3_general_ci
+SHOW CREATE TABLE `Ｔ２`;
+Table	Create Table
+Ｔ２	CREATE TABLE `Ｔ２` (
+  `Ｃ２` char(1) NOT NULL,
+  `Ｃ１` enum('あ','い','う') DEFAULT NULL,
+  KEY `Ｃ１` (`Ｃ１`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
+SHOW CREATE TABLE `Ｔ３`;
+Table	Create Table
+Ｔ３	CREATE TABLE `Ｔ３` (
+  `Ｃ２` char(1) NOT NULL,
+  `Ｃ１` enum('龔','龖','龗') DEFAULT NULL,
+  KEY `Ｃ１` (`Ｃ１`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
+SHOW CREATE TABLE `Ｔ４`;
+Table	Create Table
+Ｔ４	CREATE TABLE `Ｔ４` (
+  `Ｃ２` char(1) NOT NULL,
+  `Ｃ１` enum('ｱ','ｲ','ｳ') DEFAULT NULL,
+  KEY `Ｃ１` (`Ｃ１`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
+SHOW CREATE TABLE `Ｔ５`;
+Table	Create Table
+Ｔ５	CREATE TABLE `Ｔ５` (
+  `Ｃ２` char(1) NOT NULL,
+  `Ｃ１` enum('あ','い','う') DEFAULT NULL,
+  KEY `Ｃ１` (`Ｃ１`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
+SHOW CREATE TABLE `Ｔ６`;
+Table	Create Table
+Ｔ６	CREATE TABLE `Ｔ６` (
+  `Ｃ２` char(1) NOT NULL,
+  `Ｃ１` enum('龔','龖','龗') DEFAULT NULL,
+  KEY `Ｃ１` (`Ｃ１`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
+SHOW CREATE TABLE `Ｔ７`;
+Table	Create Table
+Ｔ７	CREATE TABLE `Ｔ７` (
+  `Ｃ２` char(1) NOT NULL,
+  `Ｃ１` enum('ｱ','ｲ','ｳ') DEFAULT NULL,
+  KEY `Ｃ１` (`Ｃ１`)
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
+SHOW CREATE TABLE `Ｔ８`;
+Table	Create Table
+Ｔ８	CREATE TABLE `Ｔ８` (
+  `Ｃ２` char(1) NOT NULL,
+  `Ｃ１` enum('あ','い','う') DEFAULT NULL,
+  KEY `Ｃ１` (`Ｃ１`)
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
+SHOW CREATE TABLE `Ｔ９`;
+Table	Create Table
+Ｔ９	CREATE TABLE `Ｔ９` (
+  `Ｃ２` char(1) NOT NULL,
+  `Ｃ１` enum('龔','龖','龗') DEFAULT NULL,
+  KEY `Ｃ１` (`Ｃ１`)
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_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 `Ｔ９`;