diff options
Diffstat (limited to 'mysql-test')
129 files changed, 1303 insertions, 885 deletions
diff --git a/mysql-test/suite/jp/r/jp_alter_sjis.result b/mysql-test/suite/jp/r/jp_alter_sjis.result index f970508229a..32ae7d5729d 100644 --- a/mysql-test/suite/jp/r/jp_alter_sjis.result +++ b/mysql-test/suite/jp/r/jp_alter_sjis.result @@ -31,8 +31,8 @@ NULL 吵吵 NULL NULL DESC `北盽; Field Type Null Key Default Extra 抖 char(1) YES MUL NULL -贩 char(6) PRI -父 char(1) YES MUL NULL +贩 char(6) NO PRI +父 char(1) YES UNI NULL 构 char(1) YES NULL SHOW CREATE TABLE `北盽; Table Create Table @@ -58,7 +58,7 @@ SELECT * FROM `北盽; 吵吵 DESC `北盽; Field Type Null Key Default Extra -贩 char(6) +贩 char(6) NO SHOW CREATE TABLE `北盽; Table Create Table 北 CREATE TABLE `北盽 ( @@ -80,8 +80,8 @@ NULL 偆偆偆偆偆 NULL NULL DESC `偁偁偁`; Field Type Null Key Default Extra 偐偐 char(1) YES MUL NULL -偒偒偒 char(6) PRI -偔偔偔 char(1) YES MUL NULL +偒偒偒 char(6) NO PRI +偔偔偔 char(1) YES UNI NULL 偗偗偗 char(1) YES NULL SHOW CREATE TABLE `偁偁偁`; Table Create Table @@ -107,7 +107,7 @@ SELECT * FROM `偁偁偁`; 偆偆偆偆偆 DESC `偁偁偁`; Field Type Null Key Default Extra -偒偒偒 char(6) +偒偒偒 char(6) NO SHOW CREATE TABLE `偁偁偁`; Table Create Table 偁偁偁 CREATE TABLE `偁偁偁` ( @@ -129,8 +129,8 @@ NULL 昞昞昞昞昞 NULL NULL DESC `僜僜僜`; Field Type Null Key Default Extra 峔峔 char(1) YES MUL NULL -昞昞昞 char(6) PRI -擻擻擻 char(1) YES MUL NULL +昞昞昞 char(6) NO PRI +擻擻擻 char(1) YES UNI NULL 梊梊梊 char(1) YES NULL SHOW CREATE TABLE `僜僜僜`; Table Create Table @@ -156,7 +156,7 @@ SELECT * FROM `僜僜僜`; 昞昞昞昞昞 DESC `僜僜僜`; Field Type Null Key Default Extra -昞昞昞 char(6) +昞昞昞 char(6) NO SHOW CREATE TABLE `僜僜僜`; Table Create Table 僜僜僜 CREATE TABLE `僜僜僜` ( @@ -193,8 +193,8 @@ NULL 吵吵 NULL NULL DESC `北盽; Field Type Null Key Default Extra 抖 char(1) YES MUL NULL -贩 char(6) PRI -父 char(1) YES MUL NULL +贩 char(6) NO PRI +父 char(1) YES UNI NULL 构 char(1) YES NULL SHOW CREATE TABLE `北盽; Table Create Table @@ -220,7 +220,7 @@ SELECT * FROM `北盽; 吵吵 DESC `北盽; Field Type Null Key Default Extra -贩 char(6) +贩 char(6) NO SHOW CREATE TABLE `北盽; Table Create Table 北 CREATE TABLE `北盽 ( @@ -242,8 +242,8 @@ NULL 偆偆偆偆偆 NULL NULL DESC `偁偁偁`; Field Type Null Key Default Extra 偐偐 char(1) YES MUL NULL -偒偒偒 char(6) PRI -偔偔偔 char(1) YES MUL NULL +偒偒偒 char(6) NO PRI +偔偔偔 char(1) YES UNI NULL 偗偗偗 char(1) YES NULL SHOW CREATE TABLE `偁偁偁`; Table Create Table @@ -269,7 +269,7 @@ SELECT * FROM `偁偁偁`; 偆偆偆偆偆 DESC `偁偁偁`; Field Type Null Key Default Extra -偒偒偒 char(6) +偒偒偒 char(6) NO SHOW CREATE TABLE `偁偁偁`; Table Create Table 偁偁偁 CREATE TABLE `偁偁偁` ( @@ -291,8 +291,8 @@ NULL 擻擻擻擻擻 NULL NULL DESC `僜僜僜`; Field Type Null Key Default Extra 峔峔 char(1) YES MUL NULL -昞昞昞 char(6) PRI -擻擻擻 char(1) YES MUL NULL +昞昞昞 char(6) NO PRI +擻擻擻 char(1) YES UNI NULL 梊梊梊 char(1) YES NULL SHOW CREATE TABLE `僜僜僜`; Table Create Table @@ -318,7 +318,7 @@ SELECT * FROM `僜僜僜`; 擻擻擻擻擻 DESC `僜僜僜`; Field Type Null Key Default Extra -昞昞昞 char(6) +昞昞昞 char(6) NO SHOW CREATE TABLE `僜僜僜`; Table Create Table 僜僜僜 CREATE TABLE `僜僜僜` ( @@ -355,8 +355,8 @@ NULL 吵吵 NULL NULL DESC `北盽; Field Type Null Key Default Extra 抖 char(1) YES MUL NULL -贩 char(6) PRI -父 char(1) YES MUL NULL +贩 char(6) NO PRI +父 char(1) YES UNI NULL 构 char(1) YES NULL SHOW CREATE TABLE `北盽; Table Create Table @@ -368,7 +368,7 @@ Table Create Table PRIMARY KEY (`贩穈), UNIQUE KEY `父竊 (`父竊), KEY `抖禶 (`抖`) -) ENGINE=HEAP DEFAULT CHARSET=sjis +) ENGINE=MEMORY DEFAULT CHARSET=sjis ALTER TABLE `北盽 DROP INDEX `抖禶; ALTER TABLE `北盽 DROP PRIMARY KEY; ALTER TABLE `北盽 DROP INDEX `父竊; @@ -382,12 +382,12 @@ SELECT * FROM `北盽; 吵吵 DESC `北盽; Field Type Null Key Default Extra -贩 char(6) +贩 char(6) NO SHOW CREATE TABLE `北盽; Table Create Table 北 CREATE TABLE `北盽 ( `贩穈 char(6) NOT NULL default '' -) ENGINE=HEAP DEFAULT CHARSET=sjis +) ENGINE=MEMORY DEFAULT CHARSET=sjis ALTER TABLE `偁偁偁` ADD `偐偐偐` char(1) FIRST; ALTER TABLE `偁偁偁` ADD `偔偔偔` char(1) AFTER `偒偒偒`; ALTER TABLE `偁偁偁` ADD `偗偗偗` char(1); @@ -404,8 +404,8 @@ NULL 偆偆偆偆偆 NULL NULL DESC `偁偁偁`; Field Type Null Key Default Extra 偐偐 char(1) YES MUL NULL -偒偒偒 char(6) PRI -偔偔偔 char(1) YES MUL NULL +偒偒偒 char(6) NO PRI +偔偔偔 char(1) YES UNI NULL 偗偗偗 char(1) YES NULL SHOW CREATE TABLE `偁偁偁`; Table Create Table @@ -417,7 +417,7 @@ Table Create Table PRIMARY KEY (`偒偒偒`), UNIQUE KEY `偔偔偔` (`偔偔偔`), KEY `偐偐偐` (`偐偐`) -) ENGINE=HEAP DEFAULT CHARSET=sjis +) ENGINE=MEMORY DEFAULT CHARSET=sjis ALTER TABLE `偁偁偁` DROP INDEX `偐偐偐`; ALTER TABLE `偁偁偁` DROP PRIMARY KEY; ALTER TABLE `偁偁偁` DROP INDEX `偔偔偔`; @@ -431,12 +431,12 @@ SELECT * FROM `偁偁偁`; 偆偆偆偆偆 DESC `偁偁偁`; Field Type Null Key Default Extra -偒偒偒 char(6) +偒偒偒 char(6) NO SHOW CREATE TABLE `偁偁偁`; Table Create Table 偁偁偁 CREATE TABLE `偁偁偁` ( `偒偒偒` char(6) NOT NULL default '' -) ENGINE=HEAP DEFAULT CHARSET=sjis +) ENGINE=MEMORY DEFAULT CHARSET=sjis ALTER TABLE `僜僜僜` ADD `峔峔峔` char(1) FIRST; ALTER TABLE `僜僜僜` ADD `擻擻擻` char(1) AFTER `昞昞昞`; ALTER TABLE `僜僜僜` ADD `梊梊梊` char(1); @@ -453,8 +453,8 @@ NULL 擻擻擻擻擻 NULL NULL DESC `僜僜僜`; Field Type Null Key Default Extra 峔峔 char(1) YES MUL NULL -昞昞昞 char(6) PRI -擻擻擻 char(1) YES MUL NULL +昞昞昞 char(6) NO PRI +擻擻擻 char(1) YES UNI NULL 梊梊梊 char(1) YES NULL SHOW CREATE TABLE `僜僜僜`; Table Create Table @@ -466,7 +466,7 @@ Table Create Table PRIMARY KEY (`昞昞昞`), UNIQUE KEY `擻擻擻` (`擻擻擻`), KEY `峔峔峔` (`峔峔`) -) ENGINE=HEAP DEFAULT CHARSET=sjis +) ENGINE=MEMORY DEFAULT CHARSET=sjis ALTER TABLE `僜僜僜` DROP INDEX `峔峔峔`; ALTER TABLE `僜僜僜` DROP PRIMARY KEY; ALTER TABLE `僜僜僜` DROP INDEX `擻擻擻`; @@ -480,12 +480,12 @@ SELECT * FROM `僜僜僜`; 擻擻擻擻擻 DESC `僜僜僜`; Field Type Null Key Default Extra -昞昞昞 char(6) +昞昞昞 char(6) NO SHOW CREATE TABLE `僜僜僜`; Table Create Table 僜僜僜 CREATE TABLE `僜僜僜` ( `昞昞昞` char(6) NOT NULL default '' -) ENGINE=HEAP DEFAULT CHARSET=sjis +) ENGINE=MEMORY DEFAULT CHARSET=sjis DROP TABLE `北盽; DROP TABLE `膊瞏; DROP TABLE `偁偁偁`; @@ -516,7 +516,7 @@ NULL 吵吵 NULL NULL DESC `北盽; Field Type Null Key Default Extra 抖 char(1) YES MUL NULL -贩 char(6) PRI +贩 char(6) NO PRI 父 char(1) YES NULL 构 char(1) YES NULL SHOW CREATE TABLE `北盽; @@ -541,7 +541,7 @@ SELECT * FROM `北盽; 吵吵 DESC `北盽; Field Type Null Key Default Extra -贩 char(6) +贩 char(6) NO SHOW CREATE TABLE `北盽; Table Create Table 北 CREATE TABLE `北盽 ( @@ -562,7 +562,7 @@ NULL 偆偆偆偆偆 NULL NULL DESC `偁偁偁`; Field Type Null Key Default Extra 偐偐 char(1) YES MUL NULL -偒偒偒 char(6) PRI +偒偒偒 char(6) NO PRI 偔偔偔 char(1) YES NULL 偗偗偗 char(1) YES NULL SHOW CREATE TABLE `偁偁偁`; @@ -587,7 +587,7 @@ SELECT * FROM `偁偁偁`; 偆偆偆偆偆 DESC `偁偁偁`; Field Type Null Key Default Extra -偒偒偒 char(6) +偒偒偒 char(6) NO SHOW CREATE TABLE `偁偁偁`; Table Create Table 偁偁偁 CREATE TABLE `偁偁偁` ( @@ -608,7 +608,7 @@ NULL 昞昞昞昞昞 NULL NULL DESC `僜僜僜`; Field Type Null Key Default Extra 峔峔 char(1) YES MUL NULL -昞昞昞 char(6) PRI +昞昞昞 char(6) NO PRI 擻擻擻 char(1) YES NULL 梊梊梊 char(1) YES NULL SHOW CREATE TABLE `僜僜僜`; @@ -633,7 +633,7 @@ SELECT * FROM `僜僜僜`; 昞昞昞昞昞 DESC `僜僜僜`; Field Type Null Key Default Extra -昞昞昞 char(6) +昞昞昞 char(6) NO SHOW CREATE TABLE `僜僜僜`; Table Create Table 僜僜僜 CREATE TABLE `僜僜僜` ( diff --git a/mysql-test/suite/jp/r/jp_alter_ucs2.result b/mysql-test/suite/jp/r/jp_alter_ucs2.result index 2756e5a758d..746dfdd62cc 100644 --- a/mysql-test/suite/jp/r/jp_alter_ucs2.result +++ b/mysql-test/suite/jp/r/jp_alter_ucs2.result @@ -32,8 +32,8 @@ NULL 幊幊幊幊幊 NULL NULL DESC `幈幈幈`; Field Type Null Key Default Extra 幎幎 char(1) YES MUL NULL -幏幏幏 char(6) PRI -幐幐幐 char(1) YES MUL NULL +幏幏幏 char(6) NO PRI +幐幐幐 char(1) YES UNI NULL 幑幑幑 char(1) YES NULL SHOW CREATE TABLE `幈幈幈`; Table Create Table @@ -59,7 +59,7 @@ SELECT * FROM `幈幈幈`; 幊幊幊幊幊 DESC `幈幈幈`; Field Type Null Key Default Extra -幏幏幏 char(6) +幏幏幏 char(6) NO SHOW CREATE TABLE `幈幈幈`; Table Create Table 幈幈幈 CREATE TABLE `幈幈幈` ( @@ -81,8 +81,8 @@ NULL ううううう NULL NULL DESC `あああ`; Field Type Null Key Default Extra かか char(1) YES MUL NULL -ききき char(6) PRI -くくく char(1) YES MUL NULL +ききき char(6) NO PRI +くくく char(1) YES UNI NULL けけけ char(1) YES NULL SHOW CREATE TABLE `あああ`; Table Create Table @@ -108,7 +108,7 @@ SELECT * FROM `あああ`; ううううう DESC `あああ`; Field Type Null Key Default Extra -ききき char(6) +ききき char(6) NO SHOW CREATE TABLE `あああ`; Table Create Table あああ CREATE TABLE `あああ` ( @@ -130,8 +130,8 @@ NULL 彴埃彴埃彴 NULL NULL DESC `忢輳磔忢輅; Field Type Null Key Default Extra 彴阿 char(1) YES MUL NULL -彴啊彴 char(6) PRI -彴埃彴 char(1) YES MUL NULL +彴啊彴 char(6) NO PRI +彴埃彴 char(1) YES UNI NULL 彴磸按彴 char(1) YES NULL SHOW CREATE TABLE `忢輳磔忢輅; Table Create Table @@ -157,7 +157,7 @@ SELECT * FROM `忢輳磔忢輅; 彴埃彴埃彴 DESC `忢輳磔忢輅; Field Type Null Key Default Extra -彴啊彴 char(6) +彴啊彴 char(6) NO SHOW CREATE TABLE `忢輳磔忢輅; Table Create Table 忢輳磔忢 CREATE TABLE `忢輳磔忢輅 ( @@ -194,8 +194,8 @@ NULL 幊幊幊幊幊 NULL NULL DESC `幈幈幈`; Field Type Null Key Default Extra 幎幎 char(1) YES MUL NULL -幏幏幏 char(6) PRI -幐幐幐 char(1) YES MUL NULL +幏幏幏 char(6) NO PRI +幐幐幐 char(1) YES UNI NULL 幑幑幑 char(1) YES NULL SHOW CREATE TABLE `幈幈幈`; Table Create Table @@ -221,7 +221,7 @@ SELECT * FROM `幈幈幈`; 幊幊幊幊幊 DESC `幈幈幈`; Field Type Null Key Default Extra -幏幏幏 char(6) +幏幏幏 char(6) NO SHOW CREATE TABLE `幈幈幈`; Table Create Table 幈幈幈 CREATE TABLE `幈幈幈` ( @@ -243,8 +243,8 @@ NULL ううううう NULL NULL DESC `あああ`; Field Type Null Key Default Extra かか char(1) YES MUL NULL -ききき char(6) PRI -くくく char(1) YES MUL NULL +ききき char(6) NO PRI +くくく char(1) YES UNI NULL けけけ char(1) YES NULL SHOW CREATE TABLE `あああ`; Table Create Table @@ -270,7 +270,7 @@ SELECT * FROM `あああ`; ううううう DESC `あああ`; Field Type Null Key Default Extra -ききき char(6) +ききき char(6) NO SHOW CREATE TABLE `あああ`; Table Create Table あああ CREATE TABLE `あああ` ( @@ -292,8 +292,8 @@ NULL 彴埃彴埃彴 NULL NULL DESC `忢輳磔忢輅; Field Type Null Key Default Extra 彴阿 char(1) YES MUL NULL -彴啊彴 char(6) PRI -彴埃彴 char(1) YES MUL NULL +彴啊彴 char(6) NO PRI +彴埃彴 char(1) YES UNI NULL 彴磸按彴 char(1) YES NULL SHOW CREATE TABLE `忢輳磔忢輅; Table Create Table @@ -319,7 +319,7 @@ SELECT * FROM `忢輳磔忢輅; 彴埃彴埃彴 DESC `忢輳磔忢輅; Field Type Null Key Default Extra -彴啊彴 char(6) +彴啊彴 char(6) NO SHOW CREATE TABLE `忢輳磔忢輅; Table Create Table 忢輳磔忢 CREATE TABLE `忢輳磔忢輅 ( @@ -356,8 +356,8 @@ NULL 幊幊幊幊幊 NULL NULL DESC `幈幈幈`; Field Type Null Key Default Extra 幎幎 char(1) YES MUL NULL -幏幏幏 char(6) PRI -幐幐幐 char(1) YES MUL NULL +幏幏幏 char(6) NO PRI +幐幐幐 char(1) YES UNI NULL 幑幑幑 char(1) YES NULL SHOW CREATE TABLE `幈幈幈`; Table Create Table @@ -369,7 +369,7 @@ Table Create Table PRIMARY KEY (`幏幏幏`), UNIQUE KEY `幐幐幐` (`幐幐幐`), KEY `幎幎幎` (`幎幎`) -) ENGINE=HEAP DEFAULT CHARSET=ucs2 +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 ALTER TABLE `幈幈幈` DROP INDEX `幎幎幎`; ALTER TABLE `幈幈幈` DROP PRIMARY KEY; ALTER TABLE `幈幈幈` DROP INDEX `幐幐幐`; @@ -383,12 +383,12 @@ SELECT * FROM `幈幈幈`; 幊幊幊幊幊 DESC `幈幈幈`; Field Type Null Key Default Extra -幏幏幏 char(6) +幏幏幏 char(6) NO SHOW CREATE TABLE `幈幈幈`; Table Create Table 幈幈幈 CREATE TABLE `幈幈幈` ( `幏幏幏` char(6) NOT NULL default '' -) ENGINE=HEAP DEFAULT CHARSET=ucs2 +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 ALTER TABLE `あああ` ADD `かかか` char(1) FIRST; ALTER TABLE `あああ` ADD `くくく` char(1) AFTER `ききき`; ALTER TABLE `あああ` ADD `けけけ` char(1); @@ -405,8 +405,8 @@ NULL ううううう NULL NULL DESC `あああ`; Field Type Null Key Default Extra かか char(1) YES MUL NULL -ききき char(6) PRI -くくく char(1) YES MUL NULL +ききき char(6) NO PRI +くくく char(1) YES UNI NULL けけけ char(1) YES NULL SHOW CREATE TABLE `あああ`; Table Create Table @@ -418,7 +418,7 @@ Table Create Table PRIMARY KEY (`ききき`), UNIQUE KEY `くくく` (`くくく`), KEY `かかか` (`かか`) -) ENGINE=HEAP DEFAULT CHARSET=ucs2 +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 ALTER TABLE `あああ` DROP INDEX `かかか`; ALTER TABLE `あああ` DROP PRIMARY KEY; ALTER TABLE `あああ` DROP INDEX `くくく`; @@ -432,12 +432,12 @@ SELECT * FROM `あああ`; ううううう DESC `あああ`; Field Type Null Key Default Extra -ききき char(6) +ききき char(6) NO SHOW CREATE TABLE `あああ`; Table Create Table あああ CREATE TABLE `あああ` ( `ききき` char(6) NOT NULL default '' -) ENGINE=HEAP DEFAULT CHARSET=ucs2 +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 ALTER TABLE `忢輳磔忢輅 ADD `彴阿彴 char(1) FIRST; ALTER TABLE `忢輳磔忢輅 ADD `彴埃彴 char(1) AFTER `彴啊彴; ALTER TABLE `忢輳磔忢輅 ADD `彴磸按彴碻 char(1); @@ -454,8 +454,8 @@ NULL 彴埃彴埃彴 NULL NULL DESC `忢輳磔忢輅; Field Type Null Key Default Extra 彴阿 char(1) YES MUL NULL -彴啊彴 char(6) PRI -彴埃彴 char(1) YES MUL NULL +彴啊彴 char(6) NO PRI +彴埃彴 char(1) YES UNI NULL 彴磸按彴 char(1) YES NULL SHOW CREATE TABLE `忢輳磔忢輅; Table Create Table @@ -467,7 +467,7 @@ Table Create Table PRIMARY KEY (`彴啊彴), UNIQUE KEY `彴埃彴 (`彴埃彴), KEY `彴阿彴 (`彴阿`) -) ENGINE=HEAP DEFAULT CHARSET=ucs2 +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 ALTER TABLE `忢輳磔忢輅 DROP INDEX `彴阿彴; ALTER TABLE `忢輳磔忢輅 DROP PRIMARY KEY; ALTER TABLE `忢輳磔忢輅 DROP INDEX `彴埃彴; @@ -481,12 +481,12 @@ SELECT * FROM `忢輳磔忢輅; 彴埃彴埃彴 DESC `忢輳磔忢輅; Field Type Null Key Default Extra -彴啊彴 char(6) +彴啊彴 char(6) NO SHOW CREATE TABLE `忢輳磔忢輅; Table Create Table 忢輳磔忢 CREATE TABLE `忢輳磔忢輅 ( `彴啊彴 char(6) NOT NULL default '' -) ENGINE=HEAP DEFAULT CHARSET=ucs2 +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 DROP TABLE `幈幈幈`; DROP TABLE `幉幉幉`; DROP TABLE `あああ`; @@ -517,7 +517,7 @@ NULL 幊幊幊幊幊 NULL NULL DESC `幈幈幈`; Field Type Null Key Default Extra 幎幎 char(1) YES MUL NULL -幏幏幏 char(6) PRI +幏幏幏 char(6) NO PRI 幐幐幐 char(1) YES NULL 幑幑幑 char(1) YES NULL SHOW CREATE TABLE `幈幈幈`; @@ -542,7 +542,7 @@ SELECT * FROM `幈幈幈`; 幊幊幊幊幊 DESC `幈幈幈`; Field Type Null Key Default Extra -幏幏幏 char(6) +幏幏幏 char(6) NO SHOW CREATE TABLE `幈幈幈`; Table Create Table 幈幈幈 CREATE TABLE `幈幈幈` ( @@ -563,7 +563,7 @@ NULL ううううう NULL NULL DESC `あああ`; Field Type Null Key Default Extra かか char(1) YES MUL NULL -ききき char(6) PRI +ききき char(6) NO PRI くくく char(1) YES NULL けけけ char(1) YES NULL SHOW CREATE TABLE `あああ`; @@ -588,7 +588,7 @@ SELECT * FROM `あああ`; ううううう DESC `あああ`; Field Type Null Key Default Extra -ききき char(6) +ききき char(6) NO SHOW CREATE TABLE `あああ`; Table Create Table あああ CREATE TABLE `あああ` ( @@ -609,7 +609,7 @@ NULL 彴埃彴埃彴 NULL NULL DESC `忢輳磔忢輅; Field Type Null Key Default Extra 彴阿 char(1) YES MUL NULL -彴啊彴 char(6) PRI +彴啊彴 char(6) NO PRI 彴埃彴 char(1) YES NULL 彴磸按彴 char(1) YES NULL SHOW CREATE TABLE `忢輳磔忢輅; @@ -634,7 +634,7 @@ SELECT * FROM `忢輳磔忢輅; 彴埃彴埃彴 DESC `忢輳磔忢輅; Field Type Null Key Default Extra -彴啊彴 char(6) +彴啊彴 char(6) NO SHOW CREATE TABLE `忢輳磔忢輅; Table Create Table 忢輳磔忢 CREATE TABLE `忢輳磔忢輅 ( diff --git a/mysql-test/suite/jp/r/jp_alter_ujis.result b/mysql-test/suite/jp/r/jp_alter_ujis.result index afa3c79cbce..daea68caa3f 100644 --- a/mysql-test/suite/jp/r/jp_alter_ujis.result +++ b/mysql-test/suite/jp/r/jp_alter_ujis.result @@ -31,8 +31,8 @@ NULL 幊幊幊幊幊 NULL NULL DESC `幈幈幈`; Field Type Null Key Default Extra 幎幎 char(1) YES MUL NULL -幏幏幏 char(6) PRI -幐幐幐 char(1) YES MUL NULL +幏幏幏 char(6) NO PRI +幐幐幐 char(1) YES UNI NULL 幑幑幑 char(1) YES NULL SHOW CREATE TABLE `幈幈幈`; Table Create Table @@ -58,7 +58,7 @@ SELECT * FROM `幈幈幈`; 幊幊幊幊幊 DESC `幈幈幈`; Field Type Null Key Default Extra -幏幏幏 char(6) +幏幏幏 char(6) NO SHOW CREATE TABLE `幈幈幈`; Table Create Table 幈幈幈 CREATE TABLE `幈幈幈` ( @@ -80,8 +80,8 @@ NULL ううううう NULL NULL DESC `あああ`; Field Type Null Key Default Extra かか char(1) YES MUL NULL -ききき char(6) PRI -くくく char(1) YES MUL NULL +ききき char(6) NO PRI +くくく char(1) YES UNI NULL けけけ char(1) YES NULL SHOW CREATE TABLE `あああ`; Table Create Table @@ -107,7 +107,7 @@ SELECT * FROM `あああ`; ううううう DESC `あああ`; Field Type Null Key Default Extra -ききき char(6) +ききき char(6) NO SHOW CREATE TABLE `あああ`; Table Create Table あああ CREATE TABLE `あああ` ( @@ -129,8 +129,8 @@ NULL 彴埃彴埃彴 NULL NULL DESC `忢輳磔忢輅; Field Type Null Key Default Extra 彴阿 char(1) YES MUL NULL -彴啊彴 char(6) PRI -彴埃彴 char(1) YES MUL NULL +彴啊彴 char(6) NO PRI +彴埃彴 char(1) YES UNI NULL 彴磸按彴 char(1) YES NULL SHOW CREATE TABLE `忢輳磔忢輅; Table Create Table @@ -156,7 +156,7 @@ SELECT * FROM `忢輳磔忢輅; 彴埃彴埃彴 DESC `忢輳磔忢輅; Field Type Null Key Default Extra -彴啊彴 char(6) +彴啊彴 char(6) NO SHOW CREATE TABLE `忢輳磔忢輅; Table Create Table 忢輳磔忢 CREATE TABLE `忢輳磔忢輅 ( @@ -193,8 +193,8 @@ NULL 幊幊幊幊幊 NULL NULL DESC `幈幈幈`; Field Type Null Key Default Extra 幎幎 char(1) YES MUL NULL -幏幏幏 char(6) PRI -幐幐幐 char(1) YES MUL NULL +幏幏幏 char(6) NO PRI +幐幐幐 char(1) YES UNI NULL 幑幑幑 char(1) YES NULL SHOW CREATE TABLE `幈幈幈`; Table Create Table @@ -220,7 +220,7 @@ SELECT * FROM `幈幈幈`; 幊幊幊幊幊 DESC `幈幈幈`; Field Type Null Key Default Extra -幏幏幏 char(6) +幏幏幏 char(6) NO SHOW CREATE TABLE `幈幈幈`; Table Create Table 幈幈幈 CREATE TABLE `幈幈幈` ( @@ -242,8 +242,8 @@ NULL ううううう NULL NULL DESC `あああ`; Field Type Null Key Default Extra かか char(1) YES MUL NULL -ききき char(6) PRI -くくく char(1) YES MUL NULL +ききき char(6) NO PRI +くくく char(1) YES UNI NULL けけけ char(1) YES NULL SHOW CREATE TABLE `あああ`; Table Create Table @@ -269,7 +269,7 @@ SELECT * FROM `あああ`; ううううう DESC `あああ`; Field Type Null Key Default Extra -ききき char(6) +ききき char(6) NO SHOW CREATE TABLE `あああ`; Table Create Table あああ CREATE TABLE `あああ` ( @@ -291,8 +291,8 @@ NULL 彴埃彴埃彴 NULL NULL DESC `忢輳磔忢輅; Field Type Null Key Default Extra 彴阿 char(1) YES MUL NULL -彴啊彴 char(6) PRI -彴埃彴 char(1) YES MUL NULL +彴啊彴 char(6) NO PRI +彴埃彴 char(1) YES UNI NULL 彴磸按彴 char(1) YES NULL SHOW CREATE TABLE `忢輳磔忢輅; Table Create Table @@ -318,7 +318,7 @@ SELECT * FROM `忢輳磔忢輅; 彴埃彴埃彴 DESC `忢輳磔忢輅; Field Type Null Key Default Extra -彴啊彴 char(6) +彴啊彴 char(6) NO SHOW CREATE TABLE `忢輳磔忢輅; Table Create Table 忢輳磔忢 CREATE TABLE `忢輳磔忢輅 ( @@ -355,8 +355,8 @@ NULL 幊幊幊幊幊 NULL NULL DESC `幈幈幈`; Field Type Null Key Default Extra 幎幎 char(1) YES MUL NULL -幏幏幏 char(6) PRI -幐幐幐 char(1) YES MUL NULL +幏幏幏 char(6) NO PRI +幐幐幐 char(1) YES UNI NULL 幑幑幑 char(1) YES NULL SHOW CREATE TABLE `幈幈幈`; Table Create Table @@ -368,7 +368,7 @@ Table Create Table PRIMARY KEY (`幏幏幏`), UNIQUE KEY `幐幐幐` (`幐幐幐`), KEY `幎幎幎` (`幎幎`) -) ENGINE=HEAP DEFAULT CHARSET=ujis +) ENGINE=MEMORY DEFAULT CHARSET=ujis ALTER TABLE `幈幈幈` DROP INDEX `幎幎幎`; ALTER TABLE `幈幈幈` DROP PRIMARY KEY; ALTER TABLE `幈幈幈` DROP INDEX `幐幐幐`; @@ -382,12 +382,12 @@ SELECT * FROM `幈幈幈`; 幊幊幊幊幊 DESC `幈幈幈`; Field Type Null Key Default Extra -幏幏幏 char(6) +幏幏幏 char(6) NO SHOW CREATE TABLE `幈幈幈`; Table Create Table 幈幈幈 CREATE TABLE `幈幈幈` ( `幏幏幏` char(6) NOT NULL default '' -) ENGINE=HEAP DEFAULT CHARSET=ujis +) ENGINE=MEMORY DEFAULT CHARSET=ujis ALTER TABLE `あああ` ADD `かかか` char(1) FIRST; ALTER TABLE `あああ` ADD `くくく` char(1) AFTER `ききき`; ALTER TABLE `あああ` ADD `けけけ` char(1); @@ -404,8 +404,8 @@ NULL ううううう NULL NULL DESC `あああ`; Field Type Null Key Default Extra かか char(1) YES MUL NULL -ききき char(6) PRI -くくく char(1) YES MUL NULL +ききき char(6) NO PRI +くくく char(1) YES UNI NULL けけけ char(1) YES NULL SHOW CREATE TABLE `あああ`; Table Create Table @@ -417,7 +417,7 @@ Table Create Table PRIMARY KEY (`ききき`), UNIQUE KEY `くくく` (`くくく`), KEY `かかか` (`かか`) -) ENGINE=HEAP DEFAULT CHARSET=ujis +) ENGINE=MEMORY DEFAULT CHARSET=ujis ALTER TABLE `あああ` DROP INDEX `かかか`; ALTER TABLE `あああ` DROP PRIMARY KEY; ALTER TABLE `あああ` DROP INDEX `くくく`; @@ -431,12 +431,12 @@ SELECT * FROM `あああ`; ううううう DESC `あああ`; Field Type Null Key Default Extra -ききき char(6) +ききき char(6) NO SHOW CREATE TABLE `あああ`; Table Create Table あああ CREATE TABLE `あああ` ( `ききき` char(6) NOT NULL default '' -) ENGINE=HEAP DEFAULT CHARSET=ujis +) ENGINE=MEMORY DEFAULT CHARSET=ujis ALTER TABLE `忢輳磔忢輅 ADD `彴阿彴 char(1) FIRST; ALTER TABLE `忢輳磔忢輅 ADD `彴埃彴 char(1) AFTER `彴啊彴; ALTER TABLE `忢輳磔忢輅 ADD `彴磸按彴碻 char(1); @@ -453,8 +453,8 @@ NULL 彴埃彴埃彴 NULL NULL DESC `忢輳磔忢輅; Field Type Null Key Default Extra 彴阿 char(1) YES MUL NULL -彴啊彴 char(6) PRI -彴埃彴 char(1) YES MUL NULL +彴啊彴 char(6) NO PRI +彴埃彴 char(1) YES UNI NULL 彴磸按彴 char(1) YES NULL SHOW CREATE TABLE `忢輳磔忢輅; Table Create Table @@ -466,7 +466,7 @@ Table Create Table PRIMARY KEY (`彴啊彴), UNIQUE KEY `彴埃彴 (`彴埃彴), KEY `彴阿彴 (`彴阿`) -) ENGINE=HEAP DEFAULT CHARSET=ujis +) ENGINE=MEMORY DEFAULT CHARSET=ujis ALTER TABLE `忢輳磔忢輅 DROP INDEX `彴阿彴; ALTER TABLE `忢輳磔忢輅 DROP PRIMARY KEY; ALTER TABLE `忢輳磔忢輅 DROP INDEX `彴埃彴; @@ -480,12 +480,12 @@ SELECT * FROM `忢輳磔忢輅; 彴埃彴埃彴 DESC `忢輳磔忢輅; Field Type Null Key Default Extra -彴啊彴 char(6) +彴啊彴 char(6) NO SHOW CREATE TABLE `忢輳磔忢輅; Table Create Table 忢輳磔忢 CREATE TABLE `忢輳磔忢輅 ( `彴啊彴 char(6) NOT NULL default '' -) ENGINE=HEAP DEFAULT CHARSET=ujis +) ENGINE=MEMORY DEFAULT CHARSET=ujis DROP TABLE `幈幈幈`; DROP TABLE `幉幉幉`; DROP TABLE `あああ`; @@ -516,7 +516,7 @@ NULL 幊幊幊幊幊 NULL NULL DESC `幈幈幈`; Field Type Null Key Default Extra 幎幎 char(1) YES MUL NULL -幏幏幏 char(6) PRI +幏幏幏 char(6) NO PRI 幐幐幐 char(1) YES NULL 幑幑幑 char(1) YES NULL SHOW CREATE TABLE `幈幈幈`; @@ -541,7 +541,7 @@ SELECT * FROM `幈幈幈`; 幊幊幊幊幊 DESC `幈幈幈`; Field Type Null Key Default Extra -幏幏幏 char(6) +幏幏幏 char(6) NO SHOW CREATE TABLE `幈幈幈`; Table Create Table 幈幈幈 CREATE TABLE `幈幈幈` ( @@ -562,7 +562,7 @@ NULL ううううう NULL NULL DESC `あああ`; Field Type Null Key Default Extra かか char(1) YES MUL NULL -ききき char(6) PRI +ききき char(6) NO PRI くくく char(1) YES NULL けけけ char(1) YES NULL SHOW CREATE TABLE `あああ`; @@ -587,7 +587,7 @@ SELECT * FROM `あああ`; ううううう DESC `あああ`; Field Type Null Key Default Extra -ききき char(6) +ききき char(6) NO SHOW CREATE TABLE `あああ`; Table Create Table あああ CREATE TABLE `あああ` ( @@ -608,7 +608,7 @@ NULL 彴埃彴埃彴 NULL NULL DESC `忢輳磔忢輅; Field Type Null Key Default Extra 彴阿 char(1) YES MUL NULL -彴啊彴 char(6) PRI +彴啊彴 char(6) NO PRI 彴埃彴 char(1) YES NULL 彴磸按彴 char(1) YES NULL SHOW CREATE TABLE `忢輳磔忢輅; @@ -633,7 +633,7 @@ SELECT * FROM `忢輳磔忢輅; 彴埃彴埃彴 DESC `忢輳磔忢輅; Field Type Null Key Default Extra -彴啊彴 char(6) +彴啊彴 char(6) NO SHOW CREATE TABLE `忢輳磔忢輅; Table Create Table 忢輳磔忢 CREATE TABLE `忢輳磔忢輅 ( diff --git a/mysql-test/suite/jp/r/jp_alter_utf8.result b/mysql-test/suite/jp/r/jp_alter_utf8.result index 19475e06a87..f2f374eed87 100644 --- a/mysql-test/suite/jp/r/jp_alter_utf8.result +++ b/mysql-test/suite/jp/r/jp_alter_utf8.result @@ -31,8 +31,8 @@ NULL 锝筹匠锝筹匠锝 NULL NULL DESC `锝憋奖锝盽; Field Type Null Key Default Extra 锝讹蕉 char(1) YES MUL NULL -锝凤椒锝 char(6) PRI -锝革礁锝 char(1) YES MUL NULL +锝凤椒锝 char(6) NO PRI +锝革礁锝 char(1) YES UNI NULL 锝癸焦锝 char(1) YES NULL SHOW CREATE TABLE `锝憋奖锝盽; Table Create Table @@ -58,7 +58,7 @@ SELECT * FROM `锝憋奖锝盽; 锝筹匠锝筹匠锝 DESC `锝憋奖锝盽; Field Type Null Key Default Extra -锝凤椒锝 char(6) +锝凤椒锝 char(6) NO SHOW CREATE TABLE `锝憋奖锝盽; Table Create Table 锝憋奖锝 CREATE TABLE `锝憋奖锝盽 ( @@ -80,8 +80,8 @@ NULL 銇嗐亞銇嗐亞銇 NULL NULL DESC `銇傘亗銇俙; Field Type Null Key Default Extra 銇嬨亱 char(1) YES MUL NULL -銇嶃亶銇 char(6) PRI -銇忋亸銇 char(1) YES MUL NULL +銇嶃亶銇 char(6) NO PRI +銇忋亸銇 char(1) YES UNI NULL 銇戙亼銇 char(1) YES NULL SHOW CREATE TABLE `銇傘亗銇俙; Table Create Table @@ -107,7 +107,7 @@ SELECT * FROM `銇傘亗銇俙; 銇嗐亞銇嗐亞銇 DESC `銇傘亗銇俙; Field Type Null Key Default Extra -銇嶃亶銇 char(6) +銇嶃亶銇 char(6) NO SHOW CREATE TABLE `銇傘亗銇俙; Table Create Table 銇傘亗銇 CREATE TABLE `銇傘亗銇俙 ( @@ -129,8 +129,8 @@ NULL 涓呬竻涓呬竻涓 NULL NULL DESC `榫栭緰榫朻; Field Type Null Key Default Extra 涓勪竸 char(1) YES MUL NULL -涓備競涓 char(6) PRI -涓呬竻涓 char(1) YES MUL NULL +涓備競涓 char(6) NO PRI +涓呬竻涓 char(1) YES UNI NULL 涔氫箽涔 char(1) YES NULL SHOW CREATE TABLE `榫栭緰榫朻; Table Create Table @@ -156,7 +156,7 @@ SELECT * FROM `榫栭緰榫朻; 涓呬竻涓呬竻涓 DESC `榫栭緰榫朻; Field Type Null Key Default Extra -涓備競涓 char(6) +涓備競涓 char(6) NO SHOW CREATE TABLE `榫栭緰榫朻; Table Create Table 榫栭緰榫 CREATE TABLE `榫栭緰榫朻 ( @@ -193,8 +193,8 @@ NULL 锝筹匠锝筹匠锝 NULL NULL DESC `锝憋奖锝盽; Field Type Null Key Default Extra 锝讹蕉 char(1) YES MUL NULL -锝凤椒锝 char(6) PRI -锝革礁锝 char(1) YES MUL NULL +锝凤椒锝 char(6) NO PRI +锝革礁锝 char(1) YES UNI NULL 锝癸焦锝 char(1) YES NULL SHOW CREATE TABLE `锝憋奖锝盽; Table Create Table @@ -220,7 +220,7 @@ SELECT * FROM `锝憋奖锝盽; 锝筹匠锝筹匠锝 DESC `锝憋奖锝盽; Field Type Null Key Default Extra -锝凤椒锝 char(6) +锝凤椒锝 char(6) NO SHOW CREATE TABLE `锝憋奖锝盽; Table Create Table 锝憋奖锝 CREATE TABLE `锝憋奖锝盽 ( @@ -242,8 +242,8 @@ NULL 銇嗐亞銇嗐亞銇 NULL NULL DESC `銇傘亗銇俙; Field Type Null Key Default Extra 銇嬨亱 char(1) YES MUL NULL -銇嶃亶銇 char(6) PRI -銇忋亸銇 char(1) YES MUL NULL +銇嶃亶銇 char(6) NO PRI +銇忋亸銇 char(1) YES UNI NULL 銇戙亼銇 char(1) YES NULL SHOW CREATE TABLE `銇傘亗銇俙; Table Create Table @@ -269,7 +269,7 @@ SELECT * FROM `銇傘亗銇俙; 銇嗐亞銇嗐亞銇 DESC `銇傘亗銇俙; Field Type Null Key Default Extra -銇嶃亶銇 char(6) +銇嶃亶銇 char(6) NO SHOW CREATE TABLE `銇傘亗銇俙; Table Create Table 銇傘亗銇 CREATE TABLE `銇傘亗銇俙 ( @@ -291,8 +291,8 @@ NULL 涓呬竻涓呬竻涓 NULL NULL DESC `榫栭緰榫朻; Field Type Null Key Default Extra 涓勪竸 char(1) YES MUL NULL -涓備競涓 char(6) PRI -涓呬竻涓 char(1) YES MUL NULL +涓備競涓 char(6) NO PRI +涓呬竻涓 char(1) YES UNI NULL 涔氫箽涔 char(1) YES NULL SHOW CREATE TABLE `榫栭緰榫朻; Table Create Table @@ -318,7 +318,7 @@ SELECT * FROM `榫栭緰榫朻; 涓呬竻涓呬竻涓 DESC `榫栭緰榫朻; Field Type Null Key Default Extra -涓備競涓 char(6) +涓備競涓 char(6) NO SHOW CREATE TABLE `榫栭緰榫朻; Table Create Table 榫栭緰榫 CREATE TABLE `榫栭緰榫朻 ( @@ -355,8 +355,8 @@ NULL 锝筹匠锝筹匠锝 NULL NULL DESC `锝憋奖锝盽; Field Type Null Key Default Extra 锝讹蕉 char(1) YES MUL NULL -锝凤椒锝 char(6) PRI -锝革礁锝 char(1) YES MUL NULL +锝凤椒锝 char(6) NO PRI +锝革礁锝 char(1) YES UNI NULL 锝癸焦锝 char(1) YES NULL SHOW CREATE TABLE `锝憋奖锝盽; Table Create Table @@ -368,7 +368,7 @@ Table Create Table PRIMARY KEY (`锝凤椒锝穈), UNIQUE KEY `锝革礁锝竊 (`锝革礁锝竊), KEY `锝讹蕉锝禶 (`锝讹蕉`) -) ENGINE=HEAP DEFAULT CHARSET=utf8 +) ENGINE=MEMORY DEFAULT CHARSET=utf8 ALTER TABLE `锝憋奖锝盽 DROP INDEX `锝讹蕉锝禶; ALTER TABLE `锝憋奖锝盽 DROP PRIMARY KEY; ALTER TABLE `锝憋奖锝盽 DROP INDEX `锝革礁锝竊; @@ -382,12 +382,12 @@ SELECT * FROM `锝憋奖锝盽; 锝筹匠锝筹匠锝 DESC `锝憋奖锝盽; Field Type Null Key Default Extra -锝凤椒锝 char(6) +锝凤椒锝 char(6) NO SHOW CREATE TABLE `锝憋奖锝盽; Table Create Table 锝憋奖锝 CREATE TABLE `锝憋奖锝盽 ( `锝凤椒锝穈 char(6) NOT NULL default '' -) ENGINE=HEAP DEFAULT CHARSET=utf8 +) ENGINE=MEMORY DEFAULT CHARSET=utf8 ALTER TABLE `銇傘亗銇俙 ADD `銇嬨亱銇媊 char(1) FIRST; ALTER TABLE `銇傘亗銇俙 ADD `銇忋亸銇廯 char(1) AFTER `銇嶃亶銇峘; ALTER TABLE `銇傘亗銇俙 ADD `銇戙亼銇慲 char(1); @@ -404,8 +404,8 @@ NULL 銇嗐亞銇嗐亞銇 NULL NULL DESC `銇傘亗銇俙; Field Type Null Key Default Extra 銇嬨亱 char(1) YES MUL NULL -銇嶃亶銇 char(6) PRI -銇忋亸銇 char(1) YES MUL NULL +銇嶃亶銇 char(6) NO PRI +銇忋亸銇 char(1) YES UNI NULL 銇戙亼銇 char(1) YES NULL SHOW CREATE TABLE `銇傘亗銇俙; Table Create Table @@ -417,7 +417,7 @@ Table Create Table PRIMARY KEY (`銇嶃亶銇峘), UNIQUE KEY `銇忋亸銇廯 (`銇忋亸銇廯), KEY `銇嬨亱銇媊 (`銇嬨亱`) -) ENGINE=HEAP DEFAULT CHARSET=utf8 +) ENGINE=MEMORY DEFAULT CHARSET=utf8 ALTER TABLE `銇傘亗銇俙 DROP INDEX `銇嬨亱銇媊; ALTER TABLE `銇傘亗銇俙 DROP PRIMARY KEY; ALTER TABLE `銇傘亗銇俙 DROP INDEX `銇忋亸銇廯; @@ -431,12 +431,12 @@ SELECT * FROM `銇傘亗銇俙; 銇嗐亞銇嗐亞銇 DESC `銇傘亗銇俙; Field Type Null Key Default Extra -銇嶃亶銇 char(6) +銇嶃亶銇 char(6) NO SHOW CREATE TABLE `銇傘亗銇俙; Table Create Table 銇傘亗銇 CREATE TABLE `銇傘亗銇俙 ( `銇嶃亶銇峘 char(6) NOT NULL default '' -) ENGINE=HEAP DEFAULT CHARSET=utf8 +) ENGINE=MEMORY DEFAULT CHARSET=utf8 ALTER TABLE `榫栭緰榫朻 ADD `涓勪竸涓刞 char(1) FIRST; ALTER TABLE `榫栭緰榫朻 ADD `涓呬竻涓卄 char(1) AFTER `涓備競涓俙; ALTER TABLE `榫栭緰榫朻 ADD `涔氫箽涔歚 char(1); @@ -453,8 +453,8 @@ NULL 涓呬竻涓呬竻涓 NULL NULL DESC `榫栭緰榫朻; Field Type Null Key Default Extra 涓勪竸 char(1) YES MUL NULL -涓備競涓 char(6) PRI -涓呬竻涓 char(1) YES MUL NULL +涓備競涓 char(6) NO PRI +涓呬竻涓 char(1) YES UNI NULL 涔氫箽涔 char(1) YES NULL SHOW CREATE TABLE `榫栭緰榫朻; Table Create Table @@ -466,7 +466,7 @@ Table Create Table PRIMARY KEY (`涓備競涓俙), UNIQUE KEY `涓呬竻涓卄 (`涓呬竻涓卄), KEY `涓勪竸涓刞 (`涓勪竸`) -) ENGINE=HEAP DEFAULT CHARSET=utf8 +) ENGINE=MEMORY DEFAULT CHARSET=utf8 ALTER TABLE `榫栭緰榫朻 DROP INDEX `涓勪竸涓刞; ALTER TABLE `榫栭緰榫朻 DROP PRIMARY KEY; ALTER TABLE `榫栭緰榫朻 DROP INDEX `涓呬竻涓卄; @@ -480,12 +480,12 @@ SELECT * FROM `榫栭緰榫朻; 涓呬竻涓呬竻涓 DESC `榫栭緰榫朻; Field Type Null Key Default Extra -涓備競涓 char(6) +涓備競涓 char(6) NO SHOW CREATE TABLE `榫栭緰榫朻; Table Create Table 榫栭緰榫 CREATE TABLE `榫栭緰榫朻 ( `涓備競涓俙 char(6) NOT NULL default '' -) ENGINE=HEAP DEFAULT CHARSET=utf8 +) ENGINE=MEMORY DEFAULT CHARSET=utf8 DROP TABLE `锝憋奖锝盽; DROP TABLE `锝诧讲锝瞏; DROP TABLE `銇傘亗銇俙; @@ -516,7 +516,7 @@ NULL 锝筹匠锝筹匠锝 NULL NULL DESC `锝憋奖锝盽; Field Type Null Key Default Extra 锝讹蕉 char(1) YES MUL NULL -锝凤椒锝 char(6) PRI +锝凤椒锝 char(6) NO PRI 锝革礁锝 char(1) YES NULL 锝癸焦锝 char(1) YES NULL SHOW CREATE TABLE `锝憋奖锝盽; @@ -541,7 +541,7 @@ SELECT * FROM `锝憋奖锝盽; 锝筹匠锝筹匠锝 DESC `锝憋奖锝盽; Field Type Null Key Default Extra -锝凤椒锝 char(6) +锝凤椒锝 char(6) NO SHOW CREATE TABLE `锝憋奖锝盽; Table Create Table 锝憋奖锝 CREATE TABLE `锝憋奖锝盽 ( @@ -562,7 +562,7 @@ NULL 銇嗐亞銇嗐亞銇 NULL NULL DESC `銇傘亗銇俙; Field Type Null Key Default Extra 銇嬨亱 char(1) YES MUL NULL -銇嶃亶銇 char(6) PRI +銇嶃亶銇 char(6) NO PRI 銇忋亸銇 char(1) YES NULL 銇戙亼銇 char(1) YES NULL SHOW CREATE TABLE `銇傘亗銇俙; @@ -587,7 +587,7 @@ SELECT * FROM `銇傘亗銇俙; 銇嗐亞銇嗐亞銇 DESC `銇傘亗銇俙; Field Type Null Key Default Extra -銇嶃亶銇 char(6) +銇嶃亶銇 char(6) NO SHOW CREATE TABLE `銇傘亗銇俙; Table Create Table 銇傘亗銇 CREATE TABLE `銇傘亗銇俙 ( @@ -608,7 +608,7 @@ NULL 涓呬竻涓呬竻涓 NULL NULL DESC `榫栭緰榫朻; Field Type Null Key Default Extra 涓勪竸 char(1) YES MUL NULL -涓備競涓 char(6) PRI +涓備競涓 char(6) NO PRI 涓呬竻涓 char(1) YES NULL 涔氫箽涔 char(1) YES NULL SHOW CREATE TABLE `榫栭緰榫朻; @@ -633,7 +633,7 @@ SELECT * FROM `榫栭緰榫朻; 涓呬竻涓呬竻涓 DESC `榫栭緰榫朻; Field Type Null Key Default Extra -涓備競涓 char(6) +涓備競涓 char(6) NO SHOW CREATE TABLE `榫栭緰榫朻; Table Create Table 榫栭緰榫 CREATE TABLE `榫栭緰榫朻 ( diff --git a/mysql-test/suite/jp/r/jp_convert_sjis.result b/mysql-test/suite/jp/r/jp_convert_sjis.result index 8c9df3606c8..ff8a3fb2cd9 100644 --- a/mysql-test/suite/jp/r/jp_convert_sjis.result +++ b/mysql-test/suite/jp/r/jp_convert_sjis.result @@ -278,12 +278,15 @@ SELECT `俠侾`, CONVERT(`俠侾` using ujis) FROM `俿俀`; 陳陸陹険陻陼陽陾陿隀隁隂隃隄隇丒丒丒丒丒 陳陸陹険陻陼陽陾陿隀隁隂隃隄隇丒丒丒丒丒 SELECT `俠侾`, CONVERT(`俠侾` using utf8) FROM `俿俁`; 俠侾 CONVERT(`俠侾` using utf8) + 僜廫昞梊峔塡嶾怽揬擻朶榎慭抃橽歕沑淺漒瀄 僜廫昞梊峔塡嶾怽揬擻朶榎慭抃橽歕沑淺漒瀄 SELECT `俠侾`, CONVERT(`俠侾` using ucs2) FROM `俿俁`; 俠侾 CONVERT(`俠侾` using ucs2) + 僜廫昞梊峔塡嶾怽揬擻朶榎慭抃橽歕沑淺漒瀄 僜廫昞梊峔塡嶾怽揬擻朶榎慭抃橽歕沑淺漒瀄 SELECT `俠侾`, CONVERT(`俠侾` using ujis) FROM `俿俁`; 俠侾 CONVERT(`俠侾` using ujis) + 僜廫昞梊峔塡嶾怽揬擻朶榎慭抃橽歕沑淺漒瀄 僜廫昞梊峔塡嶾怽揬擻朶榎慭抃橽歕沑淺漒瀄 SELECT `俠侾`, CONVERT(`俠侾` using utf8) FROM `俿係`; 俠侾 CONVERT(`俠侾` using utf8) @@ -527,12 +530,15 @@ SELECT `俠侾`, CONVERT(`俠侾` using ujis) FROM `俿俆`; 陳陸陹険陻陼陽陾陿隀隁隂隃隄隇丒丒丒丒丒 陳陸陹険陻陼陽陾陿隀隁隂隃隄隇丒丒丒丒丒 SELECT `俠侾`, CONVERT(`俠侾` using utf8) FROM `俿俇`; 俠侾 CONVERT(`俠侾` using utf8) + 僜廫昞梊峔塡嶾怽揬擻朶榎慭抃橽歕沑淺漒瀄 僜廫昞梊峔塡嶾怽揬擻朶榎慭抃橽歕沑淺漒瀄 SELECT `俠侾`, CONVERT(`俠侾` using ucs2) FROM `俿俇`; 俠侾 CONVERT(`俠侾` using ucs2) + 僜廫昞梊峔塡嶾怽揬擻朶榎慭抃橽歕沑淺漒瀄 僜廫昞梊峔塡嶾怽揬擻朶榎慭抃橽歕沑淺漒瀄 SELECT `俠侾`, CONVERT(`俠侾` using ujis) FROM `俿俇`; 俠侾 CONVERT(`俠侾` using ujis) + 僜廫昞梊峔塡嶾怽揬擻朶榎慭抃橽歕沑淺漒瀄 僜廫昞梊峔塡嶾怽揬擻朶榎慭抃橽歕沑淺漒瀄 SELECT `俠侾`, CONVERT(`俠侾` using utf8) FROM `俿俈`; 俠侾 CONVERT(`俠侾` using utf8) @@ -777,12 +783,15 @@ SELECT `俠侾`, CONVERT(`俠侾` using ujis) FROM `俿俉`; SELECT `俠侾`, CONVERT(`俠侾` using utf8) FROM `俿俋`; 俠侾 CONVERT(`俠侾` using utf8) 僜廫昞梊峔塡嶾怽揬擻朶榎慭抃橽歕沑淺漒瀄 僜廫昞梊峔塡嶾怽揬擻朶榎慭抃橽歕沑淺漒瀄 + SELECT `俠侾`, CONVERT(`俠侾` using ucs2) FROM `俿俋`; 俠侾 CONVERT(`俠侾` using ucs2) 僜廫昞梊峔塡嶾怽揬擻朶榎慭抃橽歕沑淺漒瀄 僜廫昞梊峔塡嶾怽揬擻朶榎慭抃橽歕沑淺漒瀄 + SELECT `俠侾`, CONVERT(`俠侾` using ujis) FROM `俿俋`; 俠侾 CONVERT(`俠侾` using ujis) 僜廫昞梊峔塡嶾怽揬擻朶榎慭抃橽歕沑淺漒瀄 僜廫昞梊峔塡嶾怽揬擻朶榎慭抃橽歕沑淺漒瀄 + SELECT `俠侾`, CONVERT(`俠侾` using utf8) FROM `俿侾侽`; 俠侾 CONVERT(`俠侾` using utf8) !"#$%&'()*+,-./ !"#$%&'()*+,-./ @@ -1026,12 +1035,15 @@ SELECT `俠侾`, CONVERT(`俠侾` using ujis) FROM `俿侾侾`; SELECT `俠侾`, CONVERT(`俠侾` using utf8) FROM `俿侾俀`; 俠侾 CONVERT(`俠侾` using utf8) 僜廫昞梊峔塡嶾怽揬擻朶榎慭抃橽歕沑淺漒瀄 僜廫昞梊峔塡嶾怽揬擻朶榎慭抃橽歕沑淺漒瀄 + SELECT `俠侾`, CONVERT(`俠侾` using ucs2) FROM `俿侾俀`; 俠侾 CONVERT(`俠侾` using ucs2) 僜廫昞梊峔塡嶾怽揬擻朶榎慭抃橽歕沑淺漒瀄 僜廫昞梊峔塡嶾怽揬擻朶榎慭抃橽歕沑淺漒瀄 + SELECT `俠侾`, CONVERT(`俠侾` using ujis) FROM `俿侾俀`; 俠侾 CONVERT(`俠侾` using ujis) 僜廫昞梊峔塡嶾怽揬擻朶榎慭抃橽歕沑淺漒瀄 僜廫昞梊峔塡嶾怽揬擻朶榎慭抃橽歕沑淺漒瀄 + drop table `俿侾`; drop table `俿俀`; drop table `俿俁`; diff --git a/mysql-test/suite/jp/r/jp_create_db_sjis.result b/mysql-test/suite/jp/r/jp_create_db_sjis.result index 1ce0b7228d5..5d13cf74a39 100644 --- a/mysql-test/suite/jp/r/jp_create_db_sjis.result +++ b/mysql-test/suite/jp/r/jp_create_db_sjis.result @@ -8,6 +8,7 @@ CREATE DATABASE `擔杮岅`; CREATE DATABASE `僜廫昞`; SHOW DATABASES; Database +information_schema mysql test 僜廫昞 diff --git a/mysql-test/suite/jp/r/jp_create_db_ucs2.result b/mysql-test/suite/jp/r/jp_create_db_ucs2.result index 8fd921ea8e6..f03baadf707 100644 --- a/mysql-test/suite/jp/r/jp_create_db_ucs2.result +++ b/mysql-test/suite/jp/r/jp_create_db_ucs2.result @@ -9,6 +9,7 @@ CREATE DATABASE `泣塑胳`; CREATE DATABASE `忢軓磔忢轥; SHOW DATABASES; Database +information_schema mysql test 泣塑胳 diff --git a/mysql-test/suite/jp/r/jp_create_db_ujis.result b/mysql-test/suite/jp/r/jp_create_db_ujis.result index 45fdb34717b..627381bbacb 100644 --- a/mysql-test/suite/jp/r/jp_create_db_ujis.result +++ b/mysql-test/suite/jp/r/jp_create_db_ujis.result @@ -8,6 +8,7 @@ CREATE DATABASE `泣塑胳`; CREATE DATABASE `忢軓磔忢轥; SHOW DATABASES; Database +information_schema mysql test 泣塑胳 diff --git a/mysql-test/suite/jp/r/jp_create_db_utf8.result b/mysql-test/suite/jp/r/jp_create_db_utf8.result index c0e996040de..1813259bdc9 100644 --- a/mysql-test/suite/jp/r/jp_create_db_utf8.result +++ b/mysql-test/suite/jp/r/jp_create_db_utf8.result @@ -8,6 +8,7 @@ CREATE DATABASE `鏃ユ湰瑾瀈; CREATE DATABASE `榫旈緰榫梎; SHOW DATABASES; Database +information_schema mysql test 鏃ユ湰瑾 diff --git a/mysql-test/suite/jp/r/jp_create_tbl_sjis.result b/mysql-test/suite/jp/r/jp_create_tbl_sjis.result index ecc72f9d91b..763a25bc127 100644 --- a/mysql-test/suite/jp/r/jp_create_tbl_sjis.result +++ b/mysql-test/suite/jp/r/jp_create_tbl_sjis.result @@ -22,11 +22,23 @@ CREATE TABLE `偄偄偄`(`偒偒偒` char(1)) DEFAULT CHARSET = sjis engine=INNODB; CREATE TABLE `僜僜僜`(`塡塡塡` char(1)) DEFAULT CHARSET = sjis engine=INNODB; CREATE TABLE `廫廫廫`(`嶾嶾嶾` char(1)) DEFAULT CHARSET = sjis engine=INNODB; CREATE TABLE IF NOT EXISTS `北盽(`抖禶 char(1)) DEFAULT CHARSET = sjis engine=INNODB; +Warnings: +Note 1050 Table '北' already exists CREATE TABLE IF NOT EXISTS `膊瞏(`贩穈 char(1)) DEFAULT CHARSET = sjis engine=INNODB; +Warnings: +Note 1050 Table '膊' already exists CREATE TABLE IF NOT EXISTS `偁偁偁`(`偐偐偐` char(1)) DEFAULT CHARSET = sjis engine=INNODB; +Warnings: +Note 1050 Table '偁偁偁' already exists CREATE TABLE IF NOT EXISTS `偄偄偄`(`偒偒偒` char(1)) DEFAULT CHARSET = sjis engine=INNODB; +Warnings: +Note 1050 Table '偄偄偄' already exists CREATE TABLE IF NOT EXISTS `僜僜僜`(`塡塡塡` char(1)) DEFAULT CHARSET = sjis engine=INNODB; +Warnings: +Note 1050 Table '僜僜僜' already exists CREATE TABLE IF NOT EXISTS `廫廫廫`(`嶾嶾嶾` char(1)) DEFAULT CHARSET = sjis engine=INNODB; +Warnings: +Note 1050 Table '廫廫廫' already exists CREATE TABLE IF NOT EXISTS `吵砢(`父竊 char(1)) DEFAULT CHARSET = sjis engine=INNODB; CREATE TABLE IF NOT EXISTS `偆偆偆`(`偔偔偔` char(1)) DEFAULT CHARSET = sjis engine=INNODB; CREATE TABLE IF NOT EXISTS `昞昞昞`(`怽怽怽`char(1)) DEFAULT CHARSET = sjis engine=INNODB; @@ -178,11 +190,23 @@ CREATE TABLE `偄偄偄`(`偒偒偒` char(1)) DEFAULT CHARSET = sjis engine=MyISAM; CREATE TABLE `僜僜僜`(`塡塡塡` char(1)) DEFAULT CHARSET = sjis engine=MyISAM; CREATE TABLE `廫廫廫`(`嶾嶾嶾` char(1)) DEFAULT CHARSET = sjis engine=MyISAM; CREATE TABLE IF NOT EXISTS `北盽(`抖禶 char(1)) DEFAULT CHARSET = sjis engine=MyISAM; +Warnings: +Note 1050 Table '北' already exists CREATE TABLE IF NOT EXISTS `膊瞏(`贩穈 char(1)) DEFAULT CHARSET = sjis engine=MyISAM; +Warnings: +Note 1050 Table '膊' already exists CREATE TABLE IF NOT EXISTS `偁偁偁`(`偐偐偐` char(1)) DEFAULT CHARSET = sjis engine=MyISAM; +Warnings: +Note 1050 Table '偁偁偁' already exists CREATE TABLE IF NOT EXISTS `偄偄偄`(`偒偒偒` char(1)) DEFAULT CHARSET = sjis engine=MyISAM; +Warnings: +Note 1050 Table '偄偄偄' already exists CREATE TABLE IF NOT EXISTS `僜僜僜`(`塡塡塡` char(1)) DEFAULT CHARSET = sjis engine=MyISAM; +Warnings: +Note 1050 Table '僜僜僜' already exists CREATE TABLE IF NOT EXISTS `廫廫廫`(`嶾嶾嶾` char(1)) DEFAULT CHARSET = sjis engine=MyISAM; +Warnings: +Note 1050 Table '廫廫廫' already exists CREATE TABLE IF NOT EXISTS `吵砢(`父竊 char(1)) DEFAULT CHARSET = sjis engine=MyISAM; CREATE TABLE IF NOT EXISTS `偆偆偆`(`偔偔偔` char(1)) DEFAULT CHARSET = sjis engine=MyISAM; CREATE TABLE IF NOT EXISTS `昞昞昞`(`怽怽怽`char(1)) DEFAULT CHARSET = sjis engine=MyISAM; @@ -334,11 +358,23 @@ CREATE TABLE `偄偄偄`(`偒偒偒` char(1)) DEFAULT CHARSET = sjis engine=HEAP; CREATE TABLE `僜僜僜`(`塡塡塡` char(1)) DEFAULT CHARSET = sjis engine=HEAP; CREATE TABLE `廫廫廫`(`嶾嶾嶾` char(1)) DEFAULT CHARSET = sjis engine=HEAP; CREATE TABLE IF NOT EXISTS `北盽(`抖禶 char(1)) DEFAULT CHARSET = sjis engine=HEAP; +Warnings: +Note 1050 Table '北' already exists CREATE TABLE IF NOT EXISTS `膊瞏(`贩穈 char(1)) DEFAULT CHARSET = sjis engine=HEAP; +Warnings: +Note 1050 Table '膊' already exists CREATE TABLE IF NOT EXISTS `偁偁偁`(`偐偐偐` char(1)) DEFAULT CHARSET = sjis engine=HEAP; +Warnings: +Note 1050 Table '偁偁偁' already exists CREATE TABLE IF NOT EXISTS `偄偄偄`(`偒偒偒` char(1)) DEFAULT CHARSET = sjis engine=HEAP; +Warnings: +Note 1050 Table '偄偄偄' already exists CREATE TABLE IF NOT EXISTS `僜僜僜`(`塡塡塡` char(1)) DEFAULT CHARSET = sjis engine=HEAP; +Warnings: +Note 1050 Table '僜僜僜' already exists CREATE TABLE IF NOT EXISTS `廫廫廫`(`嶾嶾嶾` char(1)) DEFAULT CHARSET = sjis engine=HEAP; +Warnings: +Note 1050 Table '廫廫廫' already exists CREATE TABLE IF NOT EXISTS `吵砢(`父竊 char(1)) DEFAULT CHARSET = sjis engine=HEAP; CREATE TABLE IF NOT EXISTS `偆偆偆`(`偔偔偔` char(1)) DEFAULT CHARSET = sjis engine=HEAP; CREATE TABLE IF NOT EXISTS `昞昞昞`(`怽怽怽`char(1)) DEFAULT CHARSET = sjis engine=HEAP; @@ -397,77 +433,77 @@ SHOW CREATE TABLE `北盽; Table Create Table 北 CREATE TABLE `北盽 ( `抖禶 char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=sjis +) ENGINE=MEMORY DEFAULT CHARSET=sjis SHOW CREATE TABLE `膊瞏; Table Create Table 膊 CREATE TABLE `膊瞏 ( `贩穈 char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=sjis +) ENGINE=MEMORY DEFAULT CHARSET=sjis SHOW CREATE TABLE `吵砢; Table Create Table 吵 CREATE TABLE `吵砢 ( `父竊 char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=sjis +) ENGINE=MEMORY DEFAULT CHARSET=sjis SHOW CREATE TABLE `创碻; Table Create Table 创 CREATE TEMPORARY TABLE `创碻 ( `构筦 char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=sjis +) ENGINE=MEMORY DEFAULT CHARSET=sjis SHOW CREATE TABLE `档礰; Table Create Table 档 CREATE TEMPORARY TABLE `档礰 ( `汉篳 char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=sjis +) ENGINE=MEMORY DEFAULT CHARSET=sjis SHOW CREATE TABLE `偁偁偁`; Table Create Table 偁偁偁 CREATE TABLE `偁偁偁` ( `偐偐偐` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=sjis +) ENGINE=MEMORY DEFAULT CHARSET=sjis SHOW CREATE TABLE `偄偄偄`; Table Create Table 偄偄偄 CREATE TABLE `偄偄偄` ( `偒偒偒` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=sjis +) ENGINE=MEMORY DEFAULT CHARSET=sjis SHOW CREATE TABLE `偆偆偆`; Table Create Table 偆偆偆 CREATE TABLE `偆偆偆` ( `偔偔偔` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=sjis +) ENGINE=MEMORY DEFAULT CHARSET=sjis SHOW CREATE TABLE `偊偊偊`; Table Create Table 偊偊偊 CREATE TEMPORARY TABLE `偊偊偊` ( `偗偗偗` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=sjis +) ENGINE=MEMORY DEFAULT CHARSET=sjis SHOW CREATE TABLE `偍偍偍`; Table Create Table 偍偍偍 CREATE TEMPORARY TABLE `偍偍偍` ( `偙偙偙` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=sjis +) ENGINE=MEMORY DEFAULT CHARSET=sjis SHOW CREATE TABLE `僜僜僜`; Table Create Table 僜僜僜 CREATE TABLE `僜僜僜` ( `塡塡塡` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=sjis +) ENGINE=MEMORY DEFAULT CHARSET=sjis SHOW CREATE TABLE `廫廫廫`; Table Create Table 廫廫廫 CREATE TABLE `廫廫廫` ( `嶾嶾嶾` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=sjis +) ENGINE=MEMORY DEFAULT CHARSET=sjis SHOW CREATE TABLE `昞昞昞`; Table Create Table 昞昞昞 CREATE TABLE `昞昞昞` ( `怽怽怽` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=sjis +) ENGINE=MEMORY DEFAULT CHARSET=sjis SHOW CREATE TABLE `梊梊梊`; Table Create Table 梊梊梊 CREATE TEMPORARY TABLE `梊梊梊` ( `揬揬揬` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=sjis +) ENGINE=MEMORY DEFAULT CHARSET=sjis SHOW CREATE TABLE `峔峔峔`; Table Create Table 峔峔峔 CREATE TEMPORARY TABLE `峔峔峔` ( `擻擻擻` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=sjis +) ENGINE=MEMORY DEFAULT CHARSET=sjis DROP TABLE `北盽; DROP TABLE `膊瞏; DROP TABLE `吵砢; @@ -490,11 +526,23 @@ CREATE TABLE `偄偄偄`(`偒偒偒` char(1)) DEFAULT CHARSET = sjis engine=BDB; CREATE TABLE `僜僜僜`(`塡塡塡` char(1)) DEFAULT CHARSET = sjis engine=BDB; CREATE TABLE `廫廫廫`(`嶾嶾嶾` char(1)) DEFAULT CHARSET = sjis engine=BDB; CREATE TABLE IF NOT EXISTS `北盽(`抖禶 char(1)) DEFAULT CHARSET = sjis engine=BDB; +Warnings: +Note 1050 Table '北' already exists CREATE TABLE IF NOT EXISTS `膊瞏(`贩穈 char(1)) DEFAULT CHARSET = sjis engine=BDB; +Warnings: +Note 1050 Table '膊' already exists CREATE TABLE IF NOT EXISTS `偁偁偁`(`偐偐偐` char(1)) DEFAULT CHARSET = sjis engine=BDB; +Warnings: +Note 1050 Table '偁偁偁' already exists CREATE TABLE IF NOT EXISTS `偄偄偄`(`偒偒偒` char(1)) DEFAULT CHARSET = sjis engine=BDB; +Warnings: +Note 1050 Table '偄偄偄' already exists CREATE TABLE IF NOT EXISTS `僜僜僜`(`塡塡塡` char(1)) DEFAULT CHARSET = sjis engine=BDB; +Warnings: +Note 1050 Table '僜僜僜' already exists CREATE TABLE IF NOT EXISTS `廫廫廫`(`嶾嶾嶾` char(1)) DEFAULT CHARSET = sjis engine=BDB; +Warnings: +Note 1050 Table '廫廫廫' already exists CREATE TABLE IF NOT EXISTS `吵砢(`父竊 char(1)) DEFAULT CHARSET = sjis engine=BDB; CREATE TABLE IF NOT EXISTS `偆偆偆`(`偔偔偔` char(1)) DEFAULT CHARSET = sjis engine=BDB; CREATE TABLE IF NOT EXISTS `昞昞昞`(`怽怽怽`char(1)) DEFAULT CHARSET = sjis engine=BDB; diff --git a/mysql-test/suite/jp/r/jp_create_tbl_ucs2.result b/mysql-test/suite/jp/r/jp_create_tbl_ucs2.result index 0bf5a6891b0..d6616f66d9f 100644 --- a/mysql-test/suite/jp/r/jp_create_tbl_ucs2.result +++ b/mysql-test/suite/jp/r/jp_create_tbl_ucs2.result @@ -22,11 +22,23 @@ CREATE TABLE `いいい`(`ききき` char(1)) DEFAULT CHARSET = ucs2 engine=INNODB; CREATE TABLE `忢輳磔忢輅(`彴啊彴 char(1)) DEFAULT CHARSET = ucs2 engine=INNODB; CREATE TABLE `忢迯磙忢轥(`彴阿彴 char(1)) DEFAULT CHARSET = ucs2 engine=INNODB; CREATE TABLE IF NOT EXISTS `幈幈幈`(`幎幎幎` char(1)) DEFAULT CHARSET = ucs2 engine=INNODB; +Warnings: +Note 1050 Table '幈幈幈' already exists CREATE TABLE IF NOT EXISTS `幉幉幉`(`幏幏幏` char(1)) DEFAULT CHARSET = ucs2 engine=INNODB; +Warnings: +Note 1050 Table '幉幉幉' already exists CREATE TABLE IF NOT EXISTS `あああ`(`かかか` char(1)) DEFAULT CHARSET = ucs2 engine=INNODB; +Warnings: +Note 1050 Table 'あああ' already exists CREATE TABLE IF NOT EXISTS `いいい`(`ききき` char(1)) DEFAULT CHARSET = ucs2 engine=INNODB; +Warnings: +Note 1050 Table 'いいい' already exists CREATE TABLE IF NOT EXISTS `忢輳磔忢輅(`彴啊彴 char(1)) DEFAULT CHARSET = ucs2 engine=INNODB; +Warnings: +Note 1050 Table '忢輳磔忢' already exists CREATE TABLE IF NOT EXISTS `忢迯磙忢轥(`彴阿彴 char(1)) DEFAULT CHARSET = ucs2 engine=INNODB; +Warnings: +Note 1050 Table '忢迯磙忢' already exists CREATE TABLE IF NOT EXISTS `幊幊幊`(`幐幐幐` char(1)) DEFAULT CHARSET = ucs2 engine=INNODB; CREATE TABLE IF NOT EXISTS `ううう`(`くくく` char(1)) DEFAULT CHARSET = ucs2 engine=INNODB; CREATE TABLE IF NOT EXISTS `忢邚磉忢違(`彴埃彴char(1)) DEFAULT CHARSET = ucs2 engine=INNODB; @@ -178,11 +190,23 @@ CREATE TABLE `いいい`(`ききき` char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM; CREATE TABLE `忢輳磔忢輅(`彴啊彴 char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM; CREATE TABLE `忢迯磙忢轥(`彴阿彴 char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM; CREATE TABLE IF NOT EXISTS `幈幈幈`(`幎幎幎` char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM; +Warnings: +Note 1050 Table '幈幈幈' already exists CREATE TABLE IF NOT EXISTS `幉幉幉`(`幏幏幏` char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM; +Warnings: +Note 1050 Table '幉幉幉' already exists CREATE TABLE IF NOT EXISTS `あああ`(`かかか` char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM; +Warnings: +Note 1050 Table 'あああ' already exists CREATE TABLE IF NOT EXISTS `いいい`(`ききき` char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM; +Warnings: +Note 1050 Table 'いいい' already exists CREATE TABLE IF NOT EXISTS `忢輳磔忢輅(`彴啊彴 char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM; +Warnings: +Note 1050 Table '忢輳磔忢' already exists CREATE TABLE IF NOT EXISTS `忢迯磙忢轥(`彴阿彴 char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM; +Warnings: +Note 1050 Table '忢迯磙忢' already exists CREATE TABLE IF NOT EXISTS `幊幊幊`(`幐幐幐` char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM; CREATE TABLE IF NOT EXISTS `ううう`(`くくく` char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM; CREATE TABLE IF NOT EXISTS `忢邚磉忢違(`彴埃彴char(1)) DEFAULT CHARSET = ucs2 engine=MyISAM; @@ -334,11 +358,23 @@ CREATE TABLE `いいい`(`ききき` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP; CREATE TABLE `忢輳磔忢輅(`彴啊彴 char(1)) DEFAULT CHARSET = ucs2 engine=HEAP; CREATE TABLE `忢迯磙忢轥(`彴阿彴 char(1)) DEFAULT CHARSET = ucs2 engine=HEAP; CREATE TABLE IF NOT EXISTS `幈幈幈`(`幎幎幎` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP; +Warnings: +Note 1050 Table '幈幈幈' already exists CREATE TABLE IF NOT EXISTS `幉幉幉`(`幏幏幏` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP; +Warnings: +Note 1050 Table '幉幉幉' already exists CREATE TABLE IF NOT EXISTS `あああ`(`かかか` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP; +Warnings: +Note 1050 Table 'あああ' already exists CREATE TABLE IF NOT EXISTS `いいい`(`ききき` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP; +Warnings: +Note 1050 Table 'いいい' already exists CREATE TABLE IF NOT EXISTS `忢輳磔忢輅(`彴啊彴 char(1)) DEFAULT CHARSET = ucs2 engine=HEAP; +Warnings: +Note 1050 Table '忢輳磔忢' already exists CREATE TABLE IF NOT EXISTS `忢迯磙忢轥(`彴阿彴 char(1)) DEFAULT CHARSET = ucs2 engine=HEAP; +Warnings: +Note 1050 Table '忢迯磙忢' already exists CREATE TABLE IF NOT EXISTS `幊幊幊`(`幐幐幐` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP; CREATE TABLE IF NOT EXISTS `ううう`(`くくく` char(1)) DEFAULT CHARSET = ucs2 engine=HEAP; CREATE TABLE IF NOT EXISTS `忢邚磉忢違(`彴埃彴char(1)) DEFAULT CHARSET = ucs2 engine=HEAP; @@ -397,77 +433,77 @@ SHOW CREATE TABLE `幈幈幈`; Table Create Table 幈幈幈 CREATE TABLE `幈幈幈` ( `幎幎幎` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=ucs2 +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 SHOW CREATE TABLE `幉幉幉`; Table Create Table 幉幉幉 CREATE TABLE `幉幉幉` ( `幏幏幏` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=ucs2 +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 SHOW CREATE TABLE `幊幊幊`; Table Create Table 幊幊幊 CREATE TABLE `幊幊幊` ( `幐幐幐` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=ucs2 +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 SHOW CREATE TABLE `幋幋幋`; Table Create Table 幋幋幋 CREATE TEMPORARY TABLE `幋幋幋` ( `幑幑幑` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=ucs2 +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 SHOW CREATE TABLE `幍幍幍`; Table Create Table 幍幍幍 CREATE TEMPORARY TABLE `幍幍幍` ( `幒幒幒` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=ucs2 +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 SHOW CREATE TABLE `あああ`; Table Create Table あああ CREATE TABLE `あああ` ( `かかか` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=ucs2 +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 SHOW CREATE TABLE `いいい`; Table Create Table いいい CREATE TABLE `いいい` ( `ききき` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=ucs2 +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 SHOW CREATE TABLE `ううう`; Table Create Table ううう CREATE TABLE `ううう` ( `くくく` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=ucs2 +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 SHOW CREATE TABLE `えええ`; Table Create Table えええ CREATE TEMPORARY TABLE `えええ` ( `けけけ` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=ucs2 +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 SHOW CREATE TABLE `おおお`; Table Create Table おおお CREATE TEMPORARY TABLE `おおお` ( `こここ` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=ucs2 +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 SHOW CREATE TABLE `忢輳磔忢輅; Table Create Table 忢輳磔忢 CREATE TABLE `忢輳磔忢輅 ( `彴啊彴 char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=ucs2 +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 SHOW CREATE TABLE `忢迯磙忢轥; Table Create Table 忢迯磙忢 CREATE TABLE `忢迯磙忢轥 ( `彴阿彴 char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=ucs2 +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 SHOW CREATE TABLE `忢邚磉忢違; Table Create Table 忢邚磉忢 CREATE TABLE `忢邚磉忢違 ( `彴埃彴 char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=ucs2 +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 SHOW CREATE TABLE `忢鄰磬忢郹; Table Create Table 忢鄰磬忢 CREATE TEMPORARY TABLE `忢鄰磬忢郹 ( `彴挨彴 char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=ucs2 +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 SHOW CREATE TABLE `忢釓磲忢醏; Table Create Table 忢釓磲忢 CREATE TEMPORARY TABLE `忢釓磲忢醏 ( `彴哎彴 char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=ucs2 +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 DROP TABLE `幈幈幈`; DROP TABLE `幉幉幉`; DROP TABLE `幊幊幊`; @@ -490,11 +526,23 @@ CREATE TABLE `いいい`(`ききき` char(1)) DEFAULT CHARSET = ucs2 engine=BDB; CREATE TABLE `忢輳磔忢輅(`彴啊彴 char(1)) DEFAULT CHARSET = ucs2 engine=BDB; CREATE TABLE `忢迯磙忢轥(`彴阿彴 char(1)) DEFAULT CHARSET = ucs2 engine=BDB; CREATE TABLE IF NOT EXISTS `幈幈幈`(`幎幎幎` char(1)) DEFAULT CHARSET = ucs2 engine=BDB; +Warnings: +Note 1050 Table '幈幈幈' already exists CREATE TABLE IF NOT EXISTS `幉幉幉`(`幏幏幏` char(1)) DEFAULT CHARSET = ucs2 engine=BDB; +Warnings: +Note 1050 Table '幉幉幉' already exists CREATE TABLE IF NOT EXISTS `あああ`(`かかか` char(1)) DEFAULT CHARSET = ucs2 engine=BDB; +Warnings: +Note 1050 Table 'あああ' already exists CREATE TABLE IF NOT EXISTS `いいい`(`ききき` char(1)) DEFAULT CHARSET = ucs2 engine=BDB; +Warnings: +Note 1050 Table 'いいい' already exists CREATE TABLE IF NOT EXISTS `忢輳磔忢輅(`彴啊彴 char(1)) DEFAULT CHARSET = ucs2 engine=BDB; +Warnings: +Note 1050 Table '忢輳磔忢' already exists CREATE TABLE IF NOT EXISTS `忢迯磙忢轥(`彴阿彴 char(1)) DEFAULT CHARSET = ucs2 engine=BDB; +Warnings: +Note 1050 Table '忢迯磙忢' already exists CREATE TABLE IF NOT EXISTS `幊幊幊`(`幐幐幐` char(1)) DEFAULT CHARSET = ucs2 engine=BDB; CREATE TABLE IF NOT EXISTS `ううう`(`くくく` char(1)) DEFAULT CHARSET = ucs2 engine=BDB; CREATE TABLE IF NOT EXISTS `忢邚磉忢違(`彴埃彴char(1)) DEFAULT CHARSET = ucs2 engine=BDB; diff --git a/mysql-test/suite/jp/r/jp_create_tbl_ujis.result b/mysql-test/suite/jp/r/jp_create_tbl_ujis.result index ae555e5af15..f53e1e58793 100644 --- a/mysql-test/suite/jp/r/jp_create_tbl_ujis.result +++ b/mysql-test/suite/jp/r/jp_create_tbl_ujis.result @@ -22,11 +22,23 @@ CREATE TABLE `いいい`(`ききき` char(1)) DEFAULT CHARSET = ujis engine=INNODB; CREATE TABLE `忢輳磔忢輅(`彴啊彴 char(1)) DEFAULT CHARSET = ujis engine=INNODB; CREATE TABLE `忢迯磙忢轥(`彴阿彴 char(1)) DEFAULT CHARSET = ujis engine=INNODB; CREATE TABLE IF NOT EXISTS `幈幈幈`(`幎幎幎` char(1)) DEFAULT CHARSET = ujis engine=INNODB; +Warnings: +Note 1050 Table '幈幈幈' already exists CREATE TABLE IF NOT EXISTS `幉幉幉`(`幏幏幏` char(1)) DEFAULT CHARSET = ujis engine=INNODB; +Warnings: +Note 1050 Table '幉幉幉' already exists CREATE TABLE IF NOT EXISTS `あああ`(`かかか` char(1)) DEFAULT CHARSET = ujis engine=INNODB; +Warnings: +Note 1050 Table 'あああ' already exists CREATE TABLE IF NOT EXISTS `いいい`(`ききき` char(1)) DEFAULT CHARSET = ujis engine=INNODB; +Warnings: +Note 1050 Table 'いいい' already exists CREATE TABLE IF NOT EXISTS `忢輳磔忢輅(`彴啊彴 char(1)) DEFAULT CHARSET = ujis engine=INNODB; +Warnings: +Note 1050 Table '忢輳磔忢' already exists CREATE TABLE IF NOT EXISTS `忢迯磙忢轥(`彴阿彴 char(1)) DEFAULT CHARSET = ujis engine=INNODB; +Warnings: +Note 1050 Table '忢迯磙忢' already exists CREATE TABLE IF NOT EXISTS `幊幊幊`(`幐幐幐` char(1)) DEFAULT CHARSET = ujis engine=INNODB; CREATE TABLE IF NOT EXISTS `ううう`(`くくく` char(1)) DEFAULT CHARSET = ujis engine=INNODB; CREATE TABLE IF NOT EXISTS `忢邚磉忢違(`彴埃彴char(1)) DEFAULT CHARSET = ujis engine=INNODB; @@ -178,11 +190,23 @@ CREATE TABLE `いいい`(`ききき` char(1)) DEFAULT CHARSET = ujis engine=MyISAM; CREATE TABLE `忢輳磔忢輅(`彴啊彴 char(1)) DEFAULT CHARSET = ujis engine=MyISAM; CREATE TABLE `忢迯磙忢轥(`彴阿彴 char(1)) DEFAULT CHARSET = ujis engine=MyISAM; CREATE TABLE IF NOT EXISTS `幈幈幈`(`幎幎幎` char(1)) DEFAULT CHARSET = ujis engine=MyISAM; +Warnings: +Note 1050 Table '幈幈幈' already exists CREATE TABLE IF NOT EXISTS `幉幉幉`(`幏幏幏` char(1)) DEFAULT CHARSET = ujis engine=MyISAM; +Warnings: +Note 1050 Table '幉幉幉' already exists CREATE TABLE IF NOT EXISTS `あああ`(`かかか` char(1)) DEFAULT CHARSET = ujis engine=MyISAM; +Warnings: +Note 1050 Table 'あああ' already exists CREATE TABLE IF NOT EXISTS `いいい`(`ききき` char(1)) DEFAULT CHARSET = ujis engine=MyISAM; +Warnings: +Note 1050 Table 'いいい' already exists CREATE TABLE IF NOT EXISTS `忢輳磔忢輅(`彴啊彴 char(1)) DEFAULT CHARSET = ujis engine=MyISAM; +Warnings: +Note 1050 Table '忢輳磔忢' already exists CREATE TABLE IF NOT EXISTS `忢迯磙忢轥(`彴阿彴 char(1)) DEFAULT CHARSET = ujis engine=MyISAM; +Warnings: +Note 1050 Table '忢迯磙忢' already exists CREATE TABLE IF NOT EXISTS `幊幊幊`(`幐幐幐` char(1)) DEFAULT CHARSET = ujis engine=MyISAM; CREATE TABLE IF NOT EXISTS `ううう`(`くくく` char(1)) DEFAULT CHARSET = ujis engine=MyISAM; CREATE TABLE IF NOT EXISTS `忢邚磉忢違(`彴埃彴char(1)) DEFAULT CHARSET = ujis engine=MyISAM; @@ -334,11 +358,23 @@ CREATE TABLE `いいい`(`ききき` char(1)) DEFAULT CHARSET = ujis engine=HEAP; CREATE TABLE `忢輳磔忢輅(`彴啊彴 char(1)) DEFAULT CHARSET = ujis engine=HEAP; CREATE TABLE `忢迯磙忢轥(`彴阿彴 char(1)) DEFAULT CHARSET = ujis engine=HEAP; CREATE TABLE IF NOT EXISTS `幈幈幈`(`幎幎幎` char(1)) DEFAULT CHARSET = ujis engine=HEAP; +Warnings: +Note 1050 Table '幈幈幈' already exists CREATE TABLE IF NOT EXISTS `幉幉幉`(`幏幏幏` char(1)) DEFAULT CHARSET = ujis engine=HEAP; +Warnings: +Note 1050 Table '幉幉幉' already exists CREATE TABLE IF NOT EXISTS `あああ`(`かかか` char(1)) DEFAULT CHARSET = ujis engine=HEAP; +Warnings: +Note 1050 Table 'あああ' already exists CREATE TABLE IF NOT EXISTS `いいい`(`ききき` char(1)) DEFAULT CHARSET = ujis engine=HEAP; +Warnings: +Note 1050 Table 'いいい' already exists CREATE TABLE IF NOT EXISTS `忢輳磔忢輅(`彴啊彴 char(1)) DEFAULT CHARSET = ujis engine=HEAP; +Warnings: +Note 1050 Table '忢輳磔忢' already exists CREATE TABLE IF NOT EXISTS `忢迯磙忢轥(`彴阿彴 char(1)) DEFAULT CHARSET = ujis engine=HEAP; +Warnings: +Note 1050 Table '忢迯磙忢' already exists CREATE TABLE IF NOT EXISTS `幊幊幊`(`幐幐幐` char(1)) DEFAULT CHARSET = ujis engine=HEAP; CREATE TABLE IF NOT EXISTS `ううう`(`くくく` char(1)) DEFAULT CHARSET = ujis engine=HEAP; CREATE TABLE IF NOT EXISTS `忢邚磉忢違(`彴埃彴char(1)) DEFAULT CHARSET = ujis engine=HEAP; @@ -397,77 +433,77 @@ SHOW CREATE TABLE `幈幈幈`; Table Create Table 幈幈幈 CREATE TABLE `幈幈幈` ( `幎幎幎` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=ujis +) ENGINE=MEMORY DEFAULT CHARSET=ujis SHOW CREATE TABLE `幉幉幉`; Table Create Table 幉幉幉 CREATE TABLE `幉幉幉` ( `幏幏幏` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=ujis +) ENGINE=MEMORY DEFAULT CHARSET=ujis SHOW CREATE TABLE `幊幊幊`; Table Create Table 幊幊幊 CREATE TABLE `幊幊幊` ( `幐幐幐` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=ujis +) ENGINE=MEMORY DEFAULT CHARSET=ujis SHOW CREATE TABLE `幋幋幋`; Table Create Table 幋幋幋 CREATE TEMPORARY TABLE `幋幋幋` ( `幑幑幑` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=ujis +) ENGINE=MEMORY DEFAULT CHARSET=ujis SHOW CREATE TABLE `幍幍幍`; Table Create Table 幍幍幍 CREATE TEMPORARY TABLE `幍幍幍` ( `幒幒幒` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=ujis +) ENGINE=MEMORY DEFAULT CHARSET=ujis SHOW CREATE TABLE `あああ`; Table Create Table あああ CREATE TABLE `あああ` ( `かかか` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=ujis +) ENGINE=MEMORY DEFAULT CHARSET=ujis SHOW CREATE TABLE `いいい`; Table Create Table いいい CREATE TABLE `いいい` ( `ききき` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=ujis +) ENGINE=MEMORY DEFAULT CHARSET=ujis SHOW CREATE TABLE `ううう`; Table Create Table ううう CREATE TABLE `ううう` ( `くくく` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=ujis +) ENGINE=MEMORY DEFAULT CHARSET=ujis SHOW CREATE TABLE `えええ`; Table Create Table えええ CREATE TEMPORARY TABLE `えええ` ( `けけけ` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=ujis +) ENGINE=MEMORY DEFAULT CHARSET=ujis SHOW CREATE TABLE `おおお`; Table Create Table おおお CREATE TEMPORARY TABLE `おおお` ( `こここ` char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=ujis +) ENGINE=MEMORY DEFAULT CHARSET=ujis SHOW CREATE TABLE `忢輳磔忢輅; Table Create Table 忢輳磔忢 CREATE TABLE `忢輳磔忢輅 ( `彴啊彴 char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=ujis +) ENGINE=MEMORY DEFAULT CHARSET=ujis SHOW CREATE TABLE `忢迯磙忢轥; Table Create Table 忢迯磙忢 CREATE TABLE `忢迯磙忢轥 ( `彴阿彴 char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=ujis +) ENGINE=MEMORY DEFAULT CHARSET=ujis SHOW CREATE TABLE `忢邚磉忢違; Table Create Table 忢邚磉忢 CREATE TABLE `忢邚磉忢違 ( `彴埃彴 char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=ujis +) ENGINE=MEMORY DEFAULT CHARSET=ujis SHOW CREATE TABLE `忢鄰磬忢郹; Table Create Table 忢鄰磬忢 CREATE TEMPORARY TABLE `忢鄰磬忢郹 ( `彴挨彴 char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=ujis +) ENGINE=MEMORY DEFAULT CHARSET=ujis SHOW CREATE TABLE `忢釓磲忢醏; Table Create Table 忢釓磲忢 CREATE TEMPORARY TABLE `忢釓磲忢醏 ( `彴哎彴 char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=ujis +) ENGINE=MEMORY DEFAULT CHARSET=ujis DROP TABLE `幈幈幈`; DROP TABLE `幉幉幉`; DROP TABLE `幊幊幊`; @@ -490,11 +526,23 @@ CREATE TABLE `いいい`(`ききき` char(1)) DEFAULT CHARSET = ujis engine=BDB; CREATE TABLE `忢輳磔忢輅(`彴啊彴 char(1)) DEFAULT CHARSET = ujis engine=BDB; CREATE TABLE `忢迯磙忢轥(`彴阿彴 char(1)) DEFAULT CHARSET = ujis engine=BDB; CREATE TABLE IF NOT EXISTS `幈幈幈`(`幎幎幎` char(1)) DEFAULT CHARSET = ujis engine=BDB; +Warnings: +Note 1050 Table '幈幈幈' already exists CREATE TABLE IF NOT EXISTS `幉幉幉`(`幏幏幏` char(1)) DEFAULT CHARSET = ujis engine=BDB; +Warnings: +Note 1050 Table '幉幉幉' already exists CREATE TABLE IF NOT EXISTS `あああ`(`かかか` char(1)) DEFAULT CHARSET = ujis engine=BDB; +Warnings: +Note 1050 Table 'あああ' already exists CREATE TABLE IF NOT EXISTS `いいい`(`ききき` char(1)) DEFAULT CHARSET = ujis engine=BDB; +Warnings: +Note 1050 Table 'いいい' already exists CREATE TABLE IF NOT EXISTS `忢輳磔忢輅(`彴啊彴 char(1)) DEFAULT CHARSET = ujis engine=BDB; +Warnings: +Note 1050 Table '忢輳磔忢' already exists CREATE TABLE IF NOT EXISTS `忢迯磙忢轥(`彴阿彴 char(1)) DEFAULT CHARSET = ujis engine=BDB; +Warnings: +Note 1050 Table '忢迯磙忢' already exists CREATE TABLE IF NOT EXISTS `幊幊幊`(`幐幐幐` char(1)) DEFAULT CHARSET = ujis engine=BDB; CREATE TABLE IF NOT EXISTS `ううう`(`くくく` char(1)) DEFAULT CHARSET = ujis engine=BDB; CREATE TABLE IF NOT EXISTS `忢邚磉忢違(`彴埃彴char(1)) DEFAULT CHARSET = ujis engine=BDB; diff --git a/mysql-test/suite/jp/r/jp_create_tbl_utf8.result b/mysql-test/suite/jp/r/jp_create_tbl_utf8.result index d4873406c46..6df30acbd7f 100644 --- a/mysql-test/suite/jp/r/jp_create_tbl_utf8.result +++ b/mysql-test/suite/jp/r/jp_create_tbl_utf8.result @@ -22,11 +22,23 @@ CREATE TABLE `銇勩亜銇刞(`銇嶃亶銇峘 char(1)) DEFAULT CHARSET = utf8 engine=INNO CREATE TABLE `榫栭緰榫朻(`涓備競涓俙 char(1)) DEFAULT CHARSET = utf8 engine=INNODB; CREATE TABLE `榫楅緱榫梎(`涓勪竸涓刞 char(1)) DEFAULT CHARSET = utf8 engine=INNODB; CREATE TABLE IF NOT EXISTS `锝憋奖锝盽(`锝讹蕉锝禶 char(1)) DEFAULT CHARSET = utf8 engine=INNODB; +Warnings: +Note 1050 Table '锝憋奖锝' already exists CREATE TABLE IF NOT EXISTS `锝诧讲锝瞏(`锝凤椒锝穈 char(1)) DEFAULT CHARSET = utf8 engine=INNODB; +Warnings: +Note 1050 Table '锝诧讲锝' already exists CREATE TABLE IF NOT EXISTS `銇傘亗銇俙(`銇嬨亱銇媊 char(1)) DEFAULT CHARSET = utf8 engine=INNODB; +Warnings: +Note 1050 Table '銇傘亗銇' already exists CREATE TABLE IF NOT EXISTS `銇勩亜銇刞(`銇嶃亶銇峘 char(1)) DEFAULT CHARSET = utf8 engine=INNODB; +Warnings: +Note 1050 Table '銇勩亜銇' already exists CREATE TABLE IF NOT EXISTS `榫栭緰榫朻(`涓備競涓俙 char(1)) DEFAULT CHARSET = utf8 engine=INNODB; +Warnings: +Note 1050 Table '榫栭緰榫' already exists CREATE TABLE IF NOT EXISTS `榫楅緱榫梎(`涓勪竸涓刞 char(1)) DEFAULT CHARSET = utf8 engine=INNODB; +Warnings: +Note 1050 Table '榫楅緱榫' already exists CREATE TABLE IF NOT EXISTS `锝筹匠锝砢(`锝革礁锝竊 char(1)) DEFAULT CHARSET = utf8 engine=INNODB; CREATE TABLE IF NOT EXISTS `銇嗐亞銇哷(`銇忋亸銇廯 char(1)) DEFAULT CHARSET = utf8 engine=INNODB; CREATE TABLE IF NOT EXISTS `榫為緸榫瀈(`涓呬竻涓卄char(1)) DEFAULT CHARSET = utf8 engine=INNODB; @@ -178,11 +190,23 @@ CREATE TABLE `銇勩亜銇刞(`銇嶃亶銇峘 char(1)) DEFAULT CHARSET = utf8 engine=MyIS CREATE TABLE `榫栭緰榫朻(`涓備競涓俙 char(1)) DEFAULT CHARSET = utf8 engine=MyISAM; CREATE TABLE `榫楅緱榫梎(`涓勪竸涓刞 char(1)) DEFAULT CHARSET = utf8 engine=MyISAM; CREATE TABLE IF NOT EXISTS `锝憋奖锝盽(`锝讹蕉锝禶 char(1)) DEFAULT CHARSET = utf8 engine=MyISAM; +Warnings: +Note 1050 Table '锝憋奖锝' already exists CREATE TABLE IF NOT EXISTS `锝诧讲锝瞏(`锝凤椒锝穈 char(1)) DEFAULT CHARSET = utf8 engine=MyISAM; +Warnings: +Note 1050 Table '锝诧讲锝' already exists CREATE TABLE IF NOT EXISTS `銇傘亗銇俙(`銇嬨亱銇媊 char(1)) DEFAULT CHARSET = utf8 engine=MyISAM; +Warnings: +Note 1050 Table '銇傘亗銇' already exists CREATE TABLE IF NOT EXISTS `銇勩亜銇刞(`銇嶃亶銇峘 char(1)) DEFAULT CHARSET = utf8 engine=MyISAM; +Warnings: +Note 1050 Table '銇勩亜銇' already exists CREATE TABLE IF NOT EXISTS `榫栭緰榫朻(`涓備競涓俙 char(1)) DEFAULT CHARSET = utf8 engine=MyISAM; +Warnings: +Note 1050 Table '榫栭緰榫' already exists CREATE TABLE IF NOT EXISTS `榫楅緱榫梎(`涓勪竸涓刞 char(1)) DEFAULT CHARSET = utf8 engine=MyISAM; +Warnings: +Note 1050 Table '榫楅緱榫' already exists CREATE TABLE IF NOT EXISTS `锝筹匠锝砢(`锝革礁锝竊 char(1)) DEFAULT CHARSET = utf8 engine=MyISAM; CREATE TABLE IF NOT EXISTS `銇嗐亞銇哷(`銇忋亸銇廯 char(1)) DEFAULT CHARSET = utf8 engine=MyISAM; CREATE TABLE IF NOT EXISTS `榫為緸榫瀈(`涓呬竻涓卄char(1)) DEFAULT CHARSET = utf8 engine=MyISAM; @@ -334,11 +358,23 @@ CREATE TABLE `銇勩亜銇刞(`銇嶃亶銇峘 char(1)) DEFAULT CHARSET = utf8 engine=HEAP CREATE TABLE `榫栭緰榫朻(`涓備競涓俙 char(1)) DEFAULT CHARSET = utf8 engine=HEAP; CREATE TABLE `榫楅緱榫梎(`涓勪竸涓刞 char(1)) DEFAULT CHARSET = utf8 engine=HEAP; CREATE TABLE IF NOT EXISTS `锝憋奖锝盽(`锝讹蕉锝禶 char(1)) DEFAULT CHARSET = utf8 engine=HEAP; +Warnings: +Note 1050 Table '锝憋奖锝' already exists CREATE TABLE IF NOT EXISTS `锝诧讲锝瞏(`锝凤椒锝穈 char(1)) DEFAULT CHARSET = utf8 engine=HEAP; +Warnings: +Note 1050 Table '锝诧讲锝' already exists CREATE TABLE IF NOT EXISTS `銇傘亗銇俙(`銇嬨亱銇媊 char(1)) DEFAULT CHARSET = utf8 engine=HEAP; +Warnings: +Note 1050 Table '銇傘亗銇' already exists CREATE TABLE IF NOT EXISTS `銇勩亜銇刞(`銇嶃亶銇峘 char(1)) DEFAULT CHARSET = utf8 engine=HEAP; +Warnings: +Note 1050 Table '銇勩亜銇' already exists CREATE TABLE IF NOT EXISTS `榫栭緰榫朻(`涓備競涓俙 char(1)) DEFAULT CHARSET = utf8 engine=HEAP; +Warnings: +Note 1050 Table '榫栭緰榫' already exists CREATE TABLE IF NOT EXISTS `榫楅緱榫梎(`涓勪竸涓刞 char(1)) DEFAULT CHARSET = utf8 engine=HEAP; +Warnings: +Note 1050 Table '榫楅緱榫' already exists CREATE TABLE IF NOT EXISTS `锝筹匠锝砢(`锝革礁锝竊 char(1)) DEFAULT CHARSET = utf8 engine=HEAP; CREATE TABLE IF NOT EXISTS `銇嗐亞銇哷(`銇忋亸銇廯 char(1)) DEFAULT CHARSET = utf8 engine=HEAP; CREATE TABLE IF NOT EXISTS `榫為緸榫瀈(`涓呬竻涓卄char(1)) DEFAULT CHARSET = utf8 engine=HEAP; @@ -397,77 +433,77 @@ SHOW CREATE TABLE `锝憋奖锝盽; Table Create Table 锝憋奖锝 CREATE TABLE `锝憋奖锝盽 ( `锝讹蕉锝禶 char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=utf8 +) ENGINE=MEMORY DEFAULT CHARSET=utf8 SHOW CREATE TABLE `锝诧讲锝瞏; Table Create Table 锝诧讲锝 CREATE TABLE `锝诧讲锝瞏 ( `锝凤椒锝穈 char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=utf8 +) ENGINE=MEMORY DEFAULT CHARSET=utf8 SHOW CREATE TABLE `锝筹匠锝砢; Table Create Table 锝筹匠锝 CREATE TABLE `锝筹匠锝砢 ( `锝革礁锝竊 char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=utf8 +) ENGINE=MEMORY DEFAULT CHARSET=utf8 SHOW CREATE TABLE `锝达酱锝碻; Table Create Table 锝达酱锝 CREATE TEMPORARY TABLE `锝达酱锝碻 ( `锝癸焦锝筦 char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=utf8 +) ENGINE=MEMORY DEFAULT CHARSET=utf8 SHOW CREATE TABLE `锝碉降锝礰; Table Create Table 锝碉降锝 CREATE TEMPORARY TABLE `锝碉降锝礰 ( `锝猴胶锝篳 char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=utf8 +) ENGINE=MEMORY DEFAULT CHARSET=utf8 SHOW CREATE TABLE `銇傘亗銇俙; Table Create Table 銇傘亗銇 CREATE TABLE `銇傘亗銇俙 ( `銇嬨亱銇媊 char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=utf8 +) ENGINE=MEMORY DEFAULT CHARSET=utf8 SHOW CREATE TABLE `銇勩亜銇刞; Table Create Table 銇勩亜銇 CREATE TABLE `銇勩亜銇刞 ( `銇嶃亶銇峘 char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=utf8 +) ENGINE=MEMORY DEFAULT CHARSET=utf8 SHOW CREATE TABLE `銇嗐亞銇哷; Table Create Table 銇嗐亞銇 CREATE TABLE `銇嗐亞銇哷 ( `銇忋亸銇廯 char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=utf8 +) ENGINE=MEMORY DEFAULT CHARSET=utf8 SHOW CREATE TABLE `銇堛亪銇坄; Table Create Table 銇堛亪銇 CREATE TEMPORARY TABLE `銇堛亪銇坄 ( `銇戙亼銇慲 char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=utf8 +) ENGINE=MEMORY DEFAULT CHARSET=utf8 SHOW CREATE TABLE `銇娿亰銇奰; Table Create Table 銇娿亰銇 CREATE TEMPORARY TABLE `銇娿亰銇奰 ( `銇撱亾銇揱 char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=utf8 +) ENGINE=MEMORY DEFAULT CHARSET=utf8 SHOW CREATE TABLE `榫栭緰榫朻; Table Create Table 榫栭緰榫 CREATE TABLE `榫栭緰榫朻 ( `涓備競涓俙 char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=utf8 +) ENGINE=MEMORY DEFAULT CHARSET=utf8 SHOW CREATE TABLE `榫楅緱榫梎; Table Create Table 榫楅緱榫 CREATE TABLE `榫楅緱榫梎 ( `涓勪竸涓刞 char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=utf8 +) ENGINE=MEMORY DEFAULT CHARSET=utf8 SHOW CREATE TABLE `榫為緸榫瀈; Table Create Table 榫為緸榫 CREATE TABLE `榫為緸榫瀈 ( `涓呬竻涓卄 char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=utf8 +) ENGINE=MEMORY DEFAULT CHARSET=utf8 SHOW CREATE TABLE `榫￠尽榫; Table Create Table 榫￠尽榫 CREATE TEMPORARY TABLE `榫￠尽榫 ( `涓屼笇涓宍 char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=utf8 +) ENGINE=MEMORY DEFAULT CHARSET=utf8 SHOW CREATE TABLE `榫㈤劲榫; Table Create Table 榫㈤劲榫 CREATE TEMPORARY TABLE `榫㈤劲榫 ( `涓掍笒涓抈 char(1) default NULL -) ENGINE=HEAP DEFAULT CHARSET=utf8 +) ENGINE=MEMORY DEFAULT CHARSET=utf8 DROP TABLE `锝憋奖锝盽; DROP TABLE `锝诧讲锝瞏; DROP TABLE `锝筹匠锝砢; @@ -490,11 +526,23 @@ CREATE TABLE `銇勩亜銇刞(`銇嶃亶銇峘 char(1)) DEFAULT CHARSET = utf8 engine=BDB; CREATE TABLE `榫栭緰榫朻(`涓備競涓俙 char(1)) DEFAULT CHARSET = utf8 engine=BDB; CREATE TABLE `榫楅緱榫梎(`涓勪竸涓刞 char(1)) DEFAULT CHARSET = utf8 engine=BDB; CREATE TABLE IF NOT EXISTS `锝憋奖锝盽(`锝讹蕉锝禶 char(1)) DEFAULT CHARSET = utf8 engine=BDB; +Warnings: +Note 1050 Table '锝憋奖锝' already exists CREATE TABLE IF NOT EXISTS `锝诧讲锝瞏(`锝凤椒锝穈 char(1)) DEFAULT CHARSET = utf8 engine=BDB; +Warnings: +Note 1050 Table '锝诧讲锝' already exists CREATE TABLE IF NOT EXISTS `銇傘亗銇俙(`銇嬨亱銇媊 char(1)) DEFAULT CHARSET = utf8 engine=BDB; +Warnings: +Note 1050 Table '銇傘亗銇' already exists CREATE TABLE IF NOT EXISTS `銇勩亜銇刞(`銇嶃亶銇峘 char(1)) DEFAULT CHARSET = utf8 engine=BDB; +Warnings: +Note 1050 Table '銇勩亜銇' already exists CREATE TABLE IF NOT EXISTS `榫栭緰榫朻(`涓備競涓俙 char(1)) DEFAULT CHARSET = utf8 engine=BDB; +Warnings: +Note 1050 Table '榫栭緰榫' already exists CREATE TABLE IF NOT EXISTS `榫楅緱榫梎(`涓勪竸涓刞 char(1)) DEFAULT CHARSET = utf8 engine=BDB; +Warnings: +Note 1050 Table '榫楅緱榫' already exists CREATE TABLE IF NOT EXISTS `锝筹匠锝砢(`锝革礁锝竊 char(1)) DEFAULT CHARSET = utf8 engine=BDB; CREATE TABLE IF NOT EXISTS `銇嗐亞銇哷(`銇忋亸銇廯 char(1)) DEFAULT CHARSET = utf8 engine=BDB; CREATE TABLE IF NOT EXISTS `榫為緸榫瀈(`涓呬竻涓卄char(1)) DEFAULT CHARSET = utf8 engine=BDB; diff --git a/mysql-test/suite/jp/r/jp_enum_sjis.result b/mysql-test/suite/jp/r/jp_enum_sjis.result index 1e46dbffbb1..43994123e3b 100644 --- a/mysql-test/suite/jp/r/jp_enum_sjis.result +++ b/mysql-test/suite/jp/r/jp_enum_sjis.result @@ -137,19 +137,19 @@ Table Create Table 俿俈 CREATE TABLE `俿俈` ( `俠侾` enum('','','') default NULL, KEY `俠侾` (`俠侾`) -) ENGINE=HEAP DEFAULT CHARSET=sjis +) ENGINE=MEMORY DEFAULT CHARSET=sjis SHOW CREATE TABLE `俿俉`; Table Create Table 俿俉 CREATE TABLE `俿俉` ( `俠侾` enum('偁','偄','偆') default NULL, KEY `俠侾` (`俠侾`) -) ENGINE=HEAP DEFAULT CHARSET=sjis +) ENGINE=MEMORY DEFAULT CHARSET=sjis SHOW CREATE TABLE `俿俋`; Table Create Table 俿俋 CREATE TABLE `俿俋` ( `俠侾` enum('僜','廫','昞') default NULL, KEY `俠侾` (`俠侾`) -) ENGINE=HEAP DEFAULT CHARSET=sjis +) ENGINE=MEMORY DEFAULT CHARSET=sjis SHOW CREATE TABLE `俿侾侽`; Table Create Table 俿侾侽 CREATE TABLE `俿侾侽` ( @@ -219,134 +219,134 @@ ALTER TABLE `俿侾俀` ADD `俠俀` CHAR(1) NOT NULL FIRST; SHOW CREATE TABLE `俿侾`; Table Create Table 俿侾 CREATE TABLE `俿侾` ( - `俠俀` char(1) NOT NULL default '', + `俠俀` char(1) NOT NULL, `俠侾` enum('','','') default NULL, KEY `俠侾` (`俠侾`) ) ENGINE=InnoDB DEFAULT CHARSET=sjis SHOW CREATE TABLE `俿俀`; Table Create Table 俿俀 CREATE TABLE `俿俀` ( - `俠俀` char(1) NOT NULL default '', + `俠俀` char(1) NOT NULL, `俠侾` enum('偁','偄','偆') default NULL, KEY `俠侾` (`俠侾`) ) ENGINE=InnoDB DEFAULT CHARSET=sjis SHOW CREATE TABLE `俿俁`; Table Create Table 俿俁 CREATE TABLE `俿俁` ( - `俠俀` char(1) NOT NULL default '', + `俠俀` char(1) NOT NULL, `俠侾` enum('僜','廫','昞') default NULL, KEY `俠侾` (`俠侾`) ) ENGINE=InnoDB DEFAULT CHARSET=sjis SHOW CREATE TABLE `俿係`; Table Create Table 俿係 CREATE TABLE `俿係` ( - `俠俀` char(1) NOT NULL default '', + `俠俀` char(1) NOT NULL, `俠侾` enum('','','') default NULL, KEY `俠侾` (`俠侾`) ) ENGINE=MyISAM DEFAULT CHARSET=sjis SHOW CREATE TABLE `俿俆`; Table Create Table 俿俆 CREATE TABLE `俿俆` ( - `俠俀` char(1) NOT NULL default '', + `俠俀` char(1) NOT NULL, `俠侾` enum('偁','偄','偆') default NULL, KEY `俠侾` (`俠侾`) ) ENGINE=MyISAM DEFAULT CHARSET=sjis SHOW CREATE TABLE `俿俇`; Table Create Table 俿俇 CREATE TABLE `俿俇` ( - `俠俀` char(1) NOT NULL default '', + `俠俀` char(1) NOT NULL, `俠侾` enum('僜','廫','昞') default NULL, KEY `俠侾` (`俠侾`) ) ENGINE=MyISAM DEFAULT CHARSET=sjis SHOW CREATE TABLE `俿俈`; Table Create Table 俿俈 CREATE TABLE `俿俈` ( - `俠俀` char(1) NOT NULL default '', + `俠俀` char(1) NOT NULL, `俠侾` enum('','','') default NULL, KEY `俠侾` (`俠侾`) -) ENGINE=HEAP DEFAULT CHARSET=sjis +) ENGINE=MEMORY DEFAULT CHARSET=sjis SHOW CREATE TABLE `俿俉`; Table Create Table 俿俉 CREATE TABLE `俿俉` ( - `俠俀` char(1) NOT NULL default '', + `俠俀` char(1) NOT NULL, `俠侾` enum('偁','偄','偆') default NULL, KEY `俠侾` (`俠侾`) -) ENGINE=HEAP DEFAULT CHARSET=sjis +) ENGINE=MEMORY DEFAULT CHARSET=sjis SHOW CREATE TABLE `俿俋`; Table Create Table 俿俋 CREATE TABLE `俿俋` ( - `俠俀` char(1) NOT NULL default '', + `俠俀` char(1) NOT NULL, `俠侾` enum('僜','廫','昞') default NULL, KEY `俠侾` (`俠侾`) -) ENGINE=HEAP DEFAULT CHARSET=sjis +) ENGINE=MEMORY DEFAULT CHARSET=sjis SHOW CREATE TABLE `俿侾侽`; Table Create Table 俿侾侽 CREATE TABLE `俿侾侽` ( - `俠俀` char(1) NOT NULL default '', + `俠俀` char(1) NOT NULL, `俠侾` enum('','','') default NULL, KEY `俠侾` (`俠侾`) ) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis SHOW CREATE TABLE `俿侾侾`; Table Create Table 俿侾侾 CREATE TABLE `俿侾侾` ( - `俠俀` char(1) NOT NULL default '', + `俠俀` char(1) NOT NULL, `俠侾` enum('偁','偄','偆') default NULL, KEY `俠侾` (`俠侾`) ) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis SHOW CREATE TABLE `俿侾俀`; Table Create Table 俿侾俀 CREATE TABLE `俿侾俀` ( - `俠俀` char(1) NOT NULL default '', + `俠俀` char(1) NOT NULL, `俠侾` enum('僜','廫','昞') default NULL, KEY `俠侾` (`俠侾`) ) ENGINE=BerkeleyDB DEFAULT CHARSET=sjis DESC `俿侾`; Field Type Null Key Default Extra -俠俀 char(1) +俠俀 char(1) NO NULL 俠侾 enum('','','') YES MUL NULL DESC `俿俀`; Field Type Null Key Default Extra -俠俀 char(1) +俠俀 char(1) NO NULL 俠侾 enum('偁','偄','偆') YES MUL NULL DESC `俿俁`; Field Type Null Key Default Extra -俠俀 char(1) +俠俀 char(1) NO NULL 俠侾 enum('僜','廫','昞') YES MUL NULL DESC `俿係`; Field Type Null Key Default Extra -俠俀 char(1) +俠俀 char(1) NO NULL 俠侾 enum('','','') YES MUL NULL DESC `俿俆`; Field Type Null Key Default Extra -俠俀 char(1) +俠俀 char(1) NO NULL 俠侾 enum('偁','偄','偆') YES MUL NULL DESC `俿俇`; Field Type Null Key Default Extra -俠俀 char(1) +俠俀 char(1) NO NULL 俠侾 enum('僜','廫','昞') YES MUL NULL DESC `俿俈`; Field Type Null Key Default Extra -俠俀 char(1) +俠俀 char(1) NO NULL 俠侾 enum('','','') YES MUL NULL DESC `俿俉`; Field Type Null Key Default Extra -俠俀 char(1) +俠俀 char(1) NO NULL 俠侾 enum('偁','偄','偆') YES MUL NULL DESC `俿俋`; Field Type Null Key Default Extra -俠俀 char(1) +俠俀 char(1) NO NULL 俠侾 enum('僜','廫','昞') YES MUL NULL DESC `俿侾侽`; Field Type Null Key Default Extra -俠俀 char(1) +俠俀 char(1) NO NULL 俠侾 enum('','','') YES MUL NULL DESC `俿侾侾`; Field Type Null Key Default Extra -俠俀 char(1) +俠俀 char(1) NO NULL 俠侾 enum('偁','偄','偆') YES MUL NULL DESC `俿侾俀`; Field Type Null Key Default Extra -俠俀 char(1) +俠俀 char(1) NO NULL 俠侾 enum('僜','廫','昞') YES MUL NULL DROP TABLE `俿侾`; DROP TABLE `俿俀`; diff --git a/mysql-test/suite/jp/r/jp_enum_ucs2.result b/mysql-test/suite/jp/r/jp_enum_ucs2.result index a84cace35fe..c41e6c262eb 100644 --- a/mysql-test/suite/jp/r/jp_enum_ucs2.result +++ b/mysql-test/suite/jp/r/jp_enum_ucs2.result @@ -138,19 +138,19 @@ Table Create Table Ｔ７ CREATE TABLE `Ｔ７` ( `Ｃ１` enum('幈','幉','幊') default NULL, KEY `Ｃ１` (`Ｃ１`) -) ENGINE=HEAP DEFAULT CHARSET=ucs2 +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 SHOW CREATE TABLE `Ｔ８`; Table Create Table Ｔ８ CREATE TABLE `Ｔ８` ( `Ｃ１` enum('あ','い','う') default NULL, KEY `Ｃ１` (`Ｃ１`) -) ENGINE=HEAP DEFAULT CHARSET=ucs2 +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 SHOW CREATE TABLE `Ｔ９`; Table Create Table Ｔ９ CREATE TABLE `Ｔ９` ( `Ｃ１` enum('忢','忢','忢') default NULL, KEY `Ｃ１` (`Ｃ１`) -) ENGINE=HEAP DEFAULT CHARSET=ucs2 +) ENGINE=MEMORY DEFAULT CHARSET=ucs2 SHOW CREATE TABLE `Ｔ１０`; Table Create Table Ｔ１０ CREATE TABLE `Ｔ１０` ( diff --git a/mysql-test/suite/jp/r/jp_enum_ujis.result b/mysql-test/suite/jp/r/jp_enum_ujis.result index dbc850b1368..9ba445eaba5 100644 --- a/mysql-test/suite/jp/r/jp_enum_ujis.result +++ b/mysql-test/suite/jp/r/jp_enum_ujis.result @@ -137,19 +137,19 @@ Table Create Table Ｔ７ CREATE TABLE `Ｔ７` ( `Ｃ１` enum('幈','幉','幊') default NULL, KEY `Ｃ１` (`Ｃ１`) -) ENGINE=HEAP DEFAULT CHARSET=ujis +) ENGINE=MEMORY DEFAULT CHARSET=ujis SHOW CREATE TABLE `Ｔ８`; Table Create Table Ｔ８ CREATE TABLE `Ｔ８` ( `Ｃ１` enum('あ','い','う') default NULL, KEY `Ｃ１` (`Ｃ１`) -) ENGINE=HEAP DEFAULT CHARSET=ujis +) ENGINE=MEMORY DEFAULT CHARSET=ujis SHOW CREATE TABLE `Ｔ９`; Table Create Table Ｔ９ CREATE TABLE `Ｔ９` ( `Ｃ１` enum('忢','忢','忢') default NULL, KEY `Ｃ１` (`Ｃ１`) -) ENGINE=HEAP DEFAULT CHARSET=ujis +) ENGINE=MEMORY DEFAULT CHARSET=ujis SHOW CREATE TABLE `Ｔ１０`; Table Create Table Ｔ１０ CREATE TABLE `Ｔ１０` ( @@ -219,134 +219,134 @@ ALTER TABLE `Ｔ１２` ADD `Ｃ２` CHAR(1) NOT NULL FIRST; SHOW CREATE TABLE `Ｔ１`; Table Create Table Ｔ１ CREATE TABLE `Ｔ１` ( - `Ｃ２` char(1) NOT NULL default '', + `Ｃ２` char(1) NOT NULL, `Ｃ１` enum('幈','幉','幊') default NULL, KEY `Ｃ１` (`Ｃ１`) ) ENGINE=InnoDB DEFAULT CHARSET=ujis SHOW CREATE TABLE `Ｔ２`; Table Create Table Ｔ２ CREATE TABLE `Ｔ２` ( - `Ｃ２` char(1) NOT NULL default '', + `Ｃ２` char(1) NOT NULL, `Ｃ１` enum('あ','い','う') default NULL, KEY `Ｃ１` (`Ｃ１`) ) ENGINE=InnoDB DEFAULT CHARSET=ujis SHOW CREATE TABLE `Ｔ３`; Table Create Table Ｔ３ CREATE TABLE `Ｔ３` ( - `Ｃ２` char(1) NOT NULL default '', + `Ｃ２` char(1) NOT NULL, `Ｃ１` enum('忢','忢','忢') default NULL, KEY `Ｃ１` (`Ｃ１`) ) ENGINE=InnoDB DEFAULT CHARSET=ujis SHOW CREATE TABLE `Ｔ４`; Table Create Table Ｔ４ CREATE TABLE `Ｔ４` ( - `Ｃ２` char(1) NOT NULL default '', + `Ｃ２` char(1) NOT NULL, `Ｃ１` enum('幈','幉','幊') default NULL, KEY `Ｃ１` (`Ｃ１`) ) ENGINE=MyISAM DEFAULT CHARSET=ujis SHOW CREATE TABLE `Ｔ５`; Table Create Table Ｔ５ CREATE TABLE `Ｔ５` ( - `Ｃ２` char(1) NOT NULL default '', + `Ｃ２` char(1) NOT NULL, `Ｃ１` enum('あ','い','う') default NULL, KEY `Ｃ１` (`Ｃ１`) ) ENGINE=MyISAM DEFAULT CHARSET=ujis SHOW CREATE TABLE `Ｔ６`; Table Create Table Ｔ６ CREATE TABLE `Ｔ６` ( - `Ｃ２` char(1) NOT NULL default '', + `Ｃ２` char(1) NOT NULL, `Ｃ１` enum('忢','忢','忢') default NULL, KEY `Ｃ１` (`Ｃ１`) ) ENGINE=MyISAM DEFAULT CHARSET=ujis SHOW CREATE TABLE `Ｔ７`; Table Create Table Ｔ７ CREATE TABLE `Ｔ７` ( - `Ｃ２` char(1) NOT NULL default '', + `Ｃ２` char(1) NOT NULL, `Ｃ１` enum('幈','幉','幊') default NULL, KEY `Ｃ１` (`Ｃ１`) -) ENGINE=HEAP DEFAULT CHARSET=ujis +) ENGINE=MEMORY DEFAULT CHARSET=ujis SHOW CREATE TABLE `Ｔ８`; Table Create Table Ｔ８ CREATE TABLE `Ｔ８` ( - `Ｃ２` char(1) NOT NULL default '', + `Ｃ２` char(1) NOT NULL, `Ｃ１` enum('あ','い','う') default NULL, KEY `Ｃ１` (`Ｃ１`) -) ENGINE=HEAP DEFAULT CHARSET=ujis +) ENGINE=MEMORY DEFAULT CHARSET=ujis SHOW CREATE TABLE `Ｔ９`; Table Create Table Ｔ９ CREATE TABLE `Ｔ９` ( - `Ｃ２` char(1) NOT NULL default '', + `Ｃ２` char(1) NOT NULL, `Ｃ１` enum('忢','忢','忢') default NULL, KEY `Ｃ１` (`Ｃ１`) -) ENGINE=HEAP DEFAULT CHARSET=ujis +) ENGINE=MEMORY DEFAULT CHARSET=ujis SHOW CREATE TABLE `Ｔ１０`; Table Create Table Ｔ１０ CREATE TABLE `Ｔ１０` ( - `Ｃ２` char(1) NOT NULL default '', + `Ｃ２` char(1) NOT NULL, `Ｃ１` enum('幈','幉','幊') default NULL, KEY `Ｃ１` (`Ｃ１`) ) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis SHOW CREATE TABLE `Ｔ１１`; Table Create Table Ｔ１１ CREATE TABLE `Ｔ１１` ( - `Ｃ２` char(1) NOT NULL default '', + `Ｃ２` char(1) NOT NULL, `Ｃ１` enum('あ','い','う') default NULL, KEY `Ｃ１` (`Ｃ１`) ) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis SHOW CREATE TABLE `Ｔ１２`; Table Create Table Ｔ１２ CREATE TABLE `Ｔ１２` ( - `Ｃ２` char(1) NOT NULL default '', + `Ｃ２` char(1) NOT NULL, `Ｃ１` enum('忢','忢','忢') default NULL, KEY `Ｃ１` (`Ｃ１`) ) ENGINE=BerkeleyDB DEFAULT CHARSET=ujis DESC `Ｔ１`; Field Type Null Key Default Extra -Ｃ２ char(1) +Ｃ２ char(1) NO NULL Ｃ１ enum('幈','幉','幊') YES MUL NULL DESC `Ｔ２`; Field Type Null Key Default Extra -Ｃ２ char(1) +Ｃ２ char(1) NO NULL Ｃ１ enum('あ','い','う') YES MUL NULL DESC `Ｔ３`; Field Type Null Key Default Extra -Ｃ２ char(1) +Ｃ２ char(1) NO NULL Ｃ１ enum('忢','忢','忢') YES MUL NULL DESC `Ｔ４`; Field Type Null Key Default Extra -Ｃ２ char(1) +Ｃ２ char(1) NO NULL Ｃ１ enum('幈','幉','幊') YES MUL NULL DESC `Ｔ５`; Field Type Null Key Default Extra -Ｃ２ char(1) +Ｃ２ char(1) NO NULL Ｃ１ enum('あ','い','う') YES MUL NULL DESC `Ｔ６`; Field Type Null Key Default Extra -Ｃ２ char(1) +Ｃ２ char(1) NO NULL Ｃ１ enum('忢','忢','忢') YES MUL NULL DESC `Ｔ７`; Field Type Null Key Default Extra -Ｃ２ char(1) +Ｃ２ char(1) NO NULL Ｃ１ enum('幈','幉','幊') YES MUL NULL DESC `Ｔ８`; Field Type Null Key Default Extra -Ｃ２ char(1) +Ｃ２ char(1) NO NULL Ｃ１ enum('あ','い','う') YES MUL NULL DESC `Ｔ９`; Field Type Null Key Default Extra -Ｃ２ char(1) +Ｃ２ char(1) NO NULL Ｃ１ enum('忢','忢','忢') YES MUL NULL DESC `Ｔ１０`; Field Type Null Key Default Extra -Ｃ２ char(1) +Ｃ２ char(1) NO NULL Ｃ１ enum('幈','幉','幊') YES MUL NULL DESC `Ｔ１１`; Field Type Null Key Default Extra -Ｃ２ char(1) +Ｃ２ char(1) NO NULL Ｃ１ enum('あ','い','う') YES MUL NULL DESC `Ｔ１２`; Field Type Null Key Default Extra -Ｃ２ char(1) +Ｃ２ char(1) NO NULL Ｃ１ enum('忢','忢','忢') YES MUL NULL DROP TABLE `Ｔ１`; DROP TABLE `Ｔ２`; diff --git a/mysql-test/suite/jp/r/jp_enum_utf8.result b/mysql-test/suite/jp/r/jp_enum_utf8.result index f2515871ece..c4ff9193447 100644 --- a/mysql-test/suite/jp/r/jp_enum_utf8.result +++ b/mysql-test/suite/jp/r/jp_enum_utf8.result @@ -137,19 +137,19 @@ Table Create Table 锛达紬 CREATE TABLE `锛达紬` ( `锛ｏ紤` enum('锝','锝','锝') default NULL, KEY `锛ｏ紤` (`锛ｏ紤`) -) ENGINE=HEAP DEFAULT CHARSET=utf8 +) ENGINE=MEMORY DEFAULT CHARSET=utf8 SHOW CREATE TABLE `锛达紭`; Table Create Table 锛达紭 CREATE TABLE `锛达紭` ( `锛ｏ紤` enum('銇','銇','銇') default NULL, KEY `锛ｏ紤` (`锛ｏ紤`) -) ENGINE=HEAP DEFAULT CHARSET=utf8 +) ENGINE=MEMORY DEFAULT CHARSET=utf8 SHOW CREATE TABLE `锛达紮`; Table Create Table 锛达紮 CREATE TABLE `锛达紮` ( `锛ｏ紤` enum('榫','榫','榫') default NULL, KEY `锛ｏ紤` (`锛ｏ紤`) -) ENGINE=HEAP DEFAULT CHARSET=utf8 +) ENGINE=MEMORY DEFAULT CHARSET=utf8 SHOW CREATE TABLE `锛达紤锛恅; Table Create Table 锛达紤锛 CREATE TABLE `锛达紤锛恅 ( @@ -219,134 +219,134 @@ ALTER TABLE `锛达紤锛抈 ADD `锛ｏ紥` CHAR(1) NOT NULL FIRST; SHOW CREATE TABLE `锛达紤`; Table Create Table 锛达紤 CREATE TABLE `锛达紤` ( - `锛ｏ紥` char(1) NOT NULL default '', + `锛ｏ紥` char(1) NOT NULL, `锛ｏ紤` enum('锝','锝','锝') default NULL, KEY `锛ｏ紤` (`锛ｏ紤`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 SHOW CREATE TABLE `锛达紥`; Table Create Table 锛达紥 CREATE TABLE `锛达紥` ( - `锛ｏ紥` char(1) NOT NULL default '', + `锛ｏ紥` char(1) NOT NULL, `锛ｏ紤` enum('銇','銇','銇') default NULL, KEY `锛ｏ紤` (`锛ｏ紤`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 SHOW CREATE TABLE `锛达紦`; Table Create Table 锛达紦 CREATE TABLE `锛达紦` ( - `锛ｏ紥` char(1) NOT NULL default '', + `锛ｏ紥` char(1) NOT NULL, `锛ｏ紤` enum('榫','榫','榫') default NULL, KEY `锛ｏ紤` (`锛ｏ紤`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 SHOW CREATE TABLE `锛达紨`; Table Create Table 锛达紨 CREATE TABLE `锛达紨` ( - `锛ｏ紥` char(1) NOT NULL default '', + `锛ｏ紥` char(1) NOT NULL, `锛ｏ紤` enum('锝','锝','锝') default NULL, KEY `锛ｏ紤` (`锛ｏ紤`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 SHOW CREATE TABLE `锛达紩`; Table Create Table 锛达紩 CREATE TABLE `锛达紩` ( - `锛ｏ紥` char(1) NOT NULL default '', + `锛ｏ紥` char(1) NOT NULL, `锛ｏ紤` enum('銇','銇','銇') default NULL, KEY `锛ｏ紤` (`锛ｏ紤`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 SHOW CREATE TABLE `锛达紪`; Table Create Table 锛达紪 CREATE TABLE `锛达紪` ( - `锛ｏ紥` char(1) NOT NULL default '', + `锛ｏ紥` char(1) NOT NULL, `锛ｏ紤` enum('榫','榫','榫') default NULL, KEY `锛ｏ紤` (`锛ｏ紤`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 SHOW CREATE TABLE `锛达紬`; Table Create Table 锛达紬 CREATE TABLE `锛达紬` ( - `锛ｏ紥` char(1) NOT NULL default '', + `锛ｏ紥` char(1) NOT NULL, `锛ｏ紤` enum('锝','锝','锝') default NULL, KEY `锛ｏ紤` (`锛ｏ紤`) -) ENGINE=HEAP DEFAULT CHARSET=utf8 +) ENGINE=MEMORY DEFAULT CHARSET=utf8 SHOW CREATE TABLE `锛达紭`; Table Create Table 锛达紭 CREATE TABLE `锛达紭` ( - `锛ｏ紥` char(1) NOT NULL default '', + `锛ｏ紥` char(1) NOT NULL, `锛ｏ紤` enum('銇','銇','銇') default NULL, KEY `锛ｏ紤` (`锛ｏ紤`) -) ENGINE=HEAP DEFAULT CHARSET=utf8 +) ENGINE=MEMORY DEFAULT CHARSET=utf8 SHOW CREATE TABLE `锛达紮`; Table Create Table 锛达紮 CREATE TABLE `锛达紮` ( - `锛ｏ紥` char(1) NOT NULL default '', + `锛ｏ紥` char(1) NOT NULL, `锛ｏ紤` enum('榫','榫','榫') default NULL, KEY `锛ｏ紤` (`锛ｏ紤`) -) ENGINE=HEAP DEFAULT CHARSET=utf8 +) ENGINE=MEMORY DEFAULT CHARSET=utf8 SHOW CREATE TABLE `锛达紤锛恅; Table Create Table 锛达紤锛 CREATE TABLE `锛达紤锛恅 ( - `锛ｏ紥` char(1) NOT NULL default '', + `锛ｏ紥` char(1) NOT NULL, `锛ｏ紤` enum('锝','锝','锝') default NULL, KEY `锛ｏ紤` (`锛ｏ紤`) ) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8 SHOW CREATE TABLE `锛达紤锛慲; Table Create Table 锛达紤锛 CREATE TABLE `锛达紤锛慲 ( - `锛ｏ紥` char(1) NOT NULL default '', + `锛ｏ紥` char(1) NOT NULL, `锛ｏ紤` enum('銇','銇','銇') default NULL, KEY `锛ｏ紤` (`锛ｏ紤`) ) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8 SHOW CREATE TABLE `锛达紤锛抈; Table Create Table 锛达紤锛 CREATE TABLE `锛达紤锛抈 ( - `锛ｏ紥` char(1) NOT NULL default '', + `锛ｏ紥` char(1) NOT NULL, `锛ｏ紤` enum('榫','榫','榫') default NULL, KEY `锛ｏ紤` (`锛ｏ紤`) ) ENGINE=BerkeleyDB DEFAULT CHARSET=utf8 DESC `锛达紤`; Field Type Null Key Default Extra -锛ｏ紥 char(1) +锛ｏ紥 char(1) NO NULL 锛ｏ紤 enum('锝','锝','锝') YES MUL NULL DESC `锛达紥`; Field Type Null Key Default Extra -锛ｏ紥 char(1) +锛ｏ紥 char(1) NO NULL 锛ｏ紤 enum('銇','銇','銇') YES MUL NULL DESC `锛达紦`; Field Type Null Key Default Extra -锛ｏ紥 char(1) +锛ｏ紥 char(1) NO NULL 锛ｏ紤 enum('榫','榫','榫') YES MUL NULL DESC `锛达紨`; Field Type Null Key Default Extra -锛ｏ紥 char(1) +锛ｏ紥 char(1) NO NULL 锛ｏ紤 enum('锝','锝','锝') YES MUL NULL DESC `锛达紩`; Field Type Null Key Default Extra -锛ｏ紥 char(1) +锛ｏ紥 char(1) NO NULL 锛ｏ紤 enum('銇','銇','銇') YES MUL NULL DESC `锛达紪`; Field Type Null Key Default Extra -锛ｏ紥 char(1) +锛ｏ紥 char(1) NO NULL 锛ｏ紤 enum('榫','榫','榫') YES MUL NULL DESC `锛达紬`; Field Type Null Key Default Extra -锛ｏ紥 char(1) +锛ｏ紥 char(1) NO NULL 锛ｏ紤 enum('锝','锝','锝') YES MUL NULL DESC `锛达紭`; Field Type Null Key Default Extra -锛ｏ紥 char(1) +锛ｏ紥 char(1) NO NULL 锛ｏ紤 enum('銇','銇','銇') YES MUL NULL DESC `锛达紮`; Field Type Null Key Default Extra -锛ｏ紥 char(1) +锛ｏ紥 char(1) NO NULL 锛ｏ紤 enum('榫','榫','榫') YES MUL NULL DESC `锛达紤锛恅; Field Type Null Key Default Extra -锛ｏ紥 char(1) +锛ｏ紥 char(1) NO NULL 锛ｏ紤 enum('锝','锝','锝') YES MUL NULL DESC `锛达紤锛慲; Field Type Null Key Default Extra -锛ｏ紥 char(1) +锛ｏ紥 char(1) NO NULL 锛ｏ紤 enum('銇','銇','銇') YES MUL NULL DESC `锛达紤锛抈; Field Type Null Key Default Extra -锛ｏ紥 char(1) +锛ｏ紥 char(1) NO NULL 锛ｏ紤 enum('榫','榫','榫') YES MUL NULL DROP TABLE `锛达紤`; DROP TABLE `锛达紥`; diff --git a/mysql-test/suite/jp/r/jp_join_sjis.result b/mysql-test/suite/jp/r/jp_join_sjis.result index a5ccc58ae4c..95df2d5488e 100644 --- a/mysql-test/suite/jp/r/jp_join_sjis.result +++ b/mysql-test/suite/jp/r/jp_join_sjis.result @@ -71,31 +71,31 @@ 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 (`俠侾`); -俠侾 俠侾 - - NULL - NULL +俠侾 + + + SELECT * FROM `俿侾a` LEFT JOIN `俿侾b` ON (`俿侾a`.`俠侾` = `俿侾b`.`俠侾`); 俠侾 俠侾 NULL NULL SELECT * FROM `俿侾b` RIGHT JOIN `俿侾a` USING (`俠侾`); -俠侾 俠侾 - -NULL -NULL +俠侾 + + + SELECT * FROM `俿侾b` RIGHT JOIN `俿侾a` ON (`俿侾a`.`俠侾` = `俿侾b`.`俠侾`); 俠侾 俠侾 @@ -112,31 +112,31 @@ 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 (`俠侾`); -俠侾 俠侾 -偁 偁 -偐 NULL -偝 NULL +俠侾 +偁 +偐 +偝 SELECT * FROM `俿俀a` LEFT JOIN `俿俀b` ON (`俿俀a`.`俠侾` = `俿俀b`.`俠侾`); 俠侾 俠侾 偁 偁 偐 NULL 偝 NULL SELECT * FROM `俿俀b` RIGHT JOIN `俿俀a` USING (`俠侾`); -俠侾 俠侾 -偁 偁 -NULL 偐 -NULL 偝 +俠侾 +偁 +偐 +偝 SELECT * FROM `俿俀b` RIGHT JOIN `俿俀a` ON (`俿俀a`.`俠侾` = `俿俀b`.`俠侾`); 俠侾 俠侾 偁 偁 @@ -153,31 +153,31 @@ 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 (`俠侾`); -俠侾 俠侾 -僜 僜 -廫 NULL -昞 NULL +俠侾 +僜 +廫 +昞 SELECT * FROM `俿俁a` LEFT JOIN `俿俁b` ON (`俿俁a`.`俠侾` = `俿俁b`.`俠侾`); 俠侾 俠侾 僜 僜 廫 NULL 昞 NULL SELECT * FROM `俿俁b` RIGHT JOIN `俿俁a` USING (`俠侾`); -俠侾 俠侾 -僜 僜 -NULL 廫 -NULL 昞 +俠侾 +僜 +廫 +昞 SELECT * FROM `俿俁b` RIGHT JOIN `俿俁a` ON (`俿俁a`.`俠侾` = `俿俁b`.`俠侾`); 俠侾 俠侾 僜 僜 @@ -194,31 +194,31 @@ 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 (`俠侾`); -俠侾 俠侾 - - NULL - NULL +俠侾 + + + SELECT * FROM `俿係a` LEFT JOIN `俿係b` ON (`俿係a`.`俠侾` = `俿係b`.`俠侾`); 俠侾 俠侾 NULL NULL SELECT * FROM `俿係b` RIGHT JOIN `俿係a` USING (`俠侾`); -俠侾 俠侾 - -NULL -NULL +俠侾 + + + SELECT * FROM `俿係b` RIGHT JOIN `俿係a` ON (`俿係a`.`俠侾` = `俿係b`.`俠侾`); 俠侾 俠侾 @@ -235,31 +235,31 @@ 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 (`俠侾`); -俠侾 俠侾 -偁 偁 -偐 NULL -偝 NULL +俠侾 +偁 +偐 +偝 SELECT * FROM `俿俆a` LEFT JOIN `俿俆b` ON (`俿俆a`.`俠侾` = `俿俆b`.`俠侾`); 俠侾 俠侾 偁 偁 偐 NULL 偝 NULL SELECT * FROM `俿俆b` RIGHT JOIN `俿俆a` USING (`俠侾`); -俠侾 俠侾 -偁 偁 -NULL 偐 -NULL 偝 +俠侾 +偁 +偐 +偝 SELECT * FROM `俿俆b` RIGHT JOIN `俿俆a` ON (`俿俆a`.`俠侾` = `俿俆b`.`俠侾`); 俠侾 俠侾 偁 偁 @@ -276,31 +276,31 @@ 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 (`俠侾`); -俠侾 俠侾 -僜 僜 -廫 NULL -昞 NULL +俠侾 +僜 +廫 +昞 SELECT * FROM `俿俇a` LEFT JOIN `俿俇b` ON (`俿俇a`.`俠侾` = `俿俇b`.`俠侾`); 俠侾 俠侾 僜 僜 廫 NULL 昞 NULL SELECT * FROM `俿俇b` RIGHT JOIN `俿俇a` USING (`俠侾`); -俠侾 俠侾 -僜 僜 -NULL 廫 -NULL 昞 +俠侾 +僜 +廫 +昞 SELECT * FROM `俿俇b` RIGHT JOIN `俿俇a` ON (`俿俇a`.`俠侾` = `俿俇b`.`俠侾`); 俠侾 俠侾 僜 僜 @@ -317,31 +317,31 @@ 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 (`俠侾`); -俠侾 俠侾 - - NULL - NULL +俠侾 + + + SELECT * FROM `俿俈a` LEFT JOIN `俿俈b` ON (`俿俈a`.`俠侾` = `俿俈b`.`俠侾`); 俠侾 俠侾 NULL NULL SELECT * FROM `俿俈b` RIGHT JOIN `俿俈a` USING (`俠侾`); -俠侾 俠侾 - -NULL -NULL +俠侾 + + + SELECT * FROM `俿俈b` RIGHT JOIN `俿俈a` ON (`俿俈a`.`俠侾` = `俿俈b`.`俠侾`); 俠侾 俠侾 @@ -358,31 +358,31 @@ 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 (`俠侾`); -俠侾 俠侾 -偁 偁 -偐 NULL -偝 NULL +俠侾 +偁 +偐 +偝 SELECT * FROM `俿俉a` LEFT JOIN `俿俉b` ON (`俿俉a`.`俠侾` = `俿俉b`.`俠侾`); 俠侾 俠侾 偁 偁 偐 NULL 偝 NULL SELECT * FROM `俿俉b` RIGHT JOIN `俿俉a` USING (`俠侾`); -俠侾 俠侾 -偁 偁 -NULL 偐 -NULL 偝 +俠侾 +偁 +偐 +偝 SELECT * FROM `俿俉b` RIGHT JOIN `俿俉a` ON (`俿俉a`.`俠侾` = `俿俉b`.`俠侾`); 俠侾 俠侾 偁 偁 @@ -399,31 +399,31 @@ 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 (`俠侾`); -俠侾 俠侾 -僜 僜 -廫 NULL -昞 NULL +俠侾 +僜 +廫 +昞 SELECT * FROM `俿俋a` LEFT JOIN `俿俋b` ON (`俿俋a`.`俠侾` = `俿俋b`.`俠侾`); 俠侾 俠侾 僜 僜 廫 NULL 昞 NULL SELECT * FROM `俿俋b` RIGHT JOIN `俿俋a` USING (`俠侾`); -俠侾 俠侾 -僜 僜 -NULL 廫 -NULL 昞 +俠侾 +僜 +廫 +昞 SELECT * FROM `俿俋b` RIGHT JOIN `俿俋a` ON (`俿俋a`.`俠侾` = `俿俋b`.`俠侾`); 俠侾 俠侾 僜 僜 @@ -440,31 +440,31 @@ 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 (`俠侾`); -俠侾 俠侾 - - NULL - NULL +俠侾 + + + SELECT * FROM `俿侾侽a` LEFT JOIN `俿侾侽b` ON (`俿侾侽a`.`俠侾` = `俿侾侽b`.`俠侾`); 俠侾 俠侾 NULL NULL SELECT * FROM `俿侾侽b` RIGHT JOIN `俿侾侽a` USING (`俠侾`); -俠侾 俠侾 - -NULL -NULL +俠侾 + + + SELECT * FROM `俿侾侽b` RIGHT JOIN `俿侾侽a` ON (`俿侾侽a`.`俠侾` = `俿侾侽b`.`俠侾`); 俠侾 俠侾 @@ -481,31 +481,31 @@ 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 (`俠侾`); -俠侾 俠侾 -偁 偁 -偐 NULL -偝 NULL +俠侾 +偁 +偐 +偝 SELECT * FROM `俿侾侾a` LEFT JOIN `俿侾侾b` ON (`俿侾侾a`.`俠侾` = `俿侾侾b`.`俠侾`); 俠侾 俠侾 偁 偁 偐 NULL 偝 NULL SELECT * FROM `俿侾侾b` RIGHT JOIN `俿侾侾a` USING (`俠侾`); -俠侾 俠侾 -偁 偁 -NULL 偐 -NULL 偝 +俠侾 +偁 +偐 +偝 SELECT * FROM `俿侾侾b` RIGHT JOIN `俿侾侾a` ON (`俿侾侾a`.`俠侾` = `俿侾侾b`.`俠侾`); 俠侾 俠侾 偁 偁 @@ -522,31 +522,31 @@ 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 (`俠侾`); -俠侾 俠侾 -僜 僜 -廫 NULL -昞 NULL +俠侾 +僜 +廫 +昞 SELECT * FROM `俿侾俀a` LEFT JOIN `俿侾俀b` ON (`俿侾俀a`.`俠侾` = `俿侾俀b`.`俠侾`); 俠侾 俠侾 僜 僜 廫 NULL 昞 NULL SELECT * FROM `俿侾俀b` RIGHT JOIN `俿侾俀a` USING (`俠侾`); -俠侾 俠侾 -僜 僜 -NULL 廫 -NULL 昞 +俠侾 +僜 +廫 +昞 SELECT * FROM `俿侾俀b` RIGHT JOIN `俿侾俀a` ON (`俿侾俀a`.`俠侾` = `俿侾俀b`.`俠侾`); 俠侾 俠侾 僜 僜 diff --git a/mysql-test/suite/jp/r/jp_join_ucs2.result b/mysql-test/suite/jp/r/jp_join_ucs2.result index 76988f15cc4..ac19554eb5a 100644 --- a/mysql-test/suite/jp/r/jp_join_ucs2.result +++ b/mysql-test/suite/jp/r/jp_join_ucs2.result @@ -72,31 +72,31 @@ 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 (`Ｃ１`); -Ｃ１ Ｃ１ -幈 幈 -幎 NULL -幓 NULL +Ｃ１ +幈 +幎 +幓 SELECT * FROM `Ｔ１a` LEFT JOIN `Ｔ１b` ON (`Ｔ１a`.`Ｃ１` = `Ｔ１b`.`Ｃ１`); Ｃ１ Ｃ１ 幈 幈 幎 NULL 幓 NULL SELECT * FROM `Ｔ１b` RIGHT JOIN `Ｔ１a` USING (`Ｃ１`); -Ｃ１ Ｃ１ -幈 幈 -NULL 幎 -NULL 幓 +Ｃ１ +幈 +幎 +幓 SELECT * FROM `Ｔ１b` RIGHT JOIN `Ｔ１a` ON (`Ｔ１a`.`Ｃ１` = `Ｔ１b`.`Ｃ１`); Ｃ１ Ｃ１ 幈 幈 @@ -113,31 +113,31 @@ 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 (`Ｃ１`); -Ｃ１ Ｃ１ -あ あ -か NULL -さ NULL +Ｃ１ +あ +か +さ SELECT * FROM `Ｔ２a` LEFT JOIN `Ｔ２b` ON (`Ｔ２a`.`Ｃ１` = `Ｔ２b`.`Ｃ１`); Ｃ１ Ｃ１ あ あ か NULL さ NULL SELECT * FROM `Ｔ２b` RIGHT JOIN `Ｔ２a` USING (`Ｃ１`); -Ｃ１ Ｃ１ -あ あ -NULL か -NULL さ +Ｃ１ +あ +か +さ SELECT * FROM `Ｔ２b` RIGHT JOIN `Ｔ２a` ON (`Ｔ２a`.`Ｃ１` = `Ｔ２b`.`Ｃ１`); Ｃ１ Ｃ１ あ あ @@ -154,31 +154,31 @@ 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 (`Ｃ１`); -Ｃ１ Ｃ１ -忢 忢 -忢 NULL -忢 NULL +Ｃ１ +忢 +忢 +忢 SELECT * FROM `Ｔ３a` LEFT JOIN `Ｔ３b` ON (`Ｔ３a`.`Ｃ１` = `Ｔ３b`.`Ｃ１`); Ｃ１ Ｃ１ 忢 忢 忢 NULL 忢 NULL SELECT * FROM `Ｔ３b` RIGHT JOIN `Ｔ３a` USING (`Ｃ１`); -Ｃ１ Ｃ１ -忢 忢 -NULL 忢 -NULL 忢 +Ｃ１ +忢 +忢 +忢 SELECT * FROM `Ｔ３b` RIGHT JOIN `Ｔ３a` ON (`Ｔ３a`.`Ｃ１` = `Ｔ３b`.`Ｃ１`); Ｃ１ Ｃ１ 忢 忢 @@ -195,31 +195,31 @@ 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 (`Ｃ１`); -Ｃ１ Ｃ１ -幈 幈 -幎 NULL -幓 NULL +Ｃ１ +幈 +幎 +幓 SELECT * FROM `Ｔ４a` LEFT JOIN `Ｔ４b` ON (`Ｔ４a`.`Ｃ１` = `Ｔ４b`.`Ｃ１`); Ｃ１ Ｃ１ 幈 幈 幎 NULL 幓 NULL SELECT * FROM `Ｔ４b` RIGHT JOIN `Ｔ４a` USING (`Ｃ１`); -Ｃ１ Ｃ１ -幈 幈 -NULL 幎 -NULL 幓 +Ｃ１ +幈 +幎 +幓 SELECT * FROM `Ｔ４b` RIGHT JOIN `Ｔ４a` ON (`Ｔ４a`.`Ｃ１` = `Ｔ４b`.`Ｃ１`); Ｃ１ Ｃ１ 幈 幈 @@ -236,31 +236,31 @@ 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 (`Ｃ１`); -Ｃ１ Ｃ１ -あ あ -か NULL -さ NULL +Ｃ１ +あ +か +さ SELECT * FROM `Ｔ５a` LEFT JOIN `Ｔ５b` ON (`Ｔ５a`.`Ｃ１` = `Ｔ５b`.`Ｃ１`); Ｃ１ Ｃ１ あ あ か NULL さ NULL SELECT * FROM `Ｔ５b` RIGHT JOIN `Ｔ５a` USING (`Ｃ１`); -Ｃ１ Ｃ１ -あ あ -NULL か -NULL さ +Ｃ１ +あ +か +さ SELECT * FROM `Ｔ５b` RIGHT JOIN `Ｔ５a` ON (`Ｔ５a`.`Ｃ１` = `Ｔ５b`.`Ｃ１`); Ｃ１ Ｃ１ あ あ @@ -277,31 +277,31 @@ 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 (`Ｃ１`); -Ｃ１ Ｃ１ -忢 忢 -忢 NULL -忢 NULL +Ｃ１ +忢 +忢 +忢 SELECT * FROM `Ｔ６a` LEFT JOIN `Ｔ６b` ON (`Ｔ６a`.`Ｃ１` = `Ｔ６b`.`Ｃ１`); Ｃ１ Ｃ１ 忢 忢 忢 NULL 忢 NULL SELECT * FROM `Ｔ６b` RIGHT JOIN `Ｔ６a` USING (`Ｃ１`); -Ｃ１ Ｃ１ -忢 忢 -NULL 忢 -NULL 忢 +Ｃ１ +忢 +忢 +忢 SELECT * FROM `Ｔ６b` RIGHT JOIN `Ｔ６a` ON (`Ｔ６a`.`Ｃ１` = `Ｔ６b`.`Ｃ１`); Ｃ１ Ｃ１ 忢 忢 @@ -318,31 +318,31 @@ 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 (`Ｃ１`); -Ｃ１ Ｃ１ -幈 幈 -幎 NULL -幓 NULL +Ｃ１ +幈 +幎 +幓 SELECT * FROM `Ｔ７a` LEFT JOIN `Ｔ７b` ON (`Ｔ７a`.`Ｃ１` = `Ｔ７b`.`Ｃ１`); Ｃ１ Ｃ１ 幈 幈 幎 NULL 幓 NULL SELECT * FROM `Ｔ７b` RIGHT JOIN `Ｔ７a` USING (`Ｃ１`); -Ｃ１ Ｃ１ -幈 幈 -NULL 幎 -NULL 幓 +Ｃ１ +幈 +幎 +幓 SELECT * FROM `Ｔ７b` RIGHT JOIN `Ｔ７a` ON (`Ｔ７a`.`Ｃ１` = `Ｔ７b`.`Ｃ１`); Ｃ１ Ｃ１ 幈 幈 @@ -359,31 +359,31 @@ 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 (`Ｃ１`); -Ｃ１ Ｃ１ -あ あ -か NULL -さ NULL +Ｃ１ +あ +か +さ SELECT * FROM `Ｔ８a` LEFT JOIN `Ｔ８b` ON (`Ｔ８a`.`Ｃ１` = `Ｔ８b`.`Ｃ１`); Ｃ１ Ｃ１ あ あ か NULL さ NULL SELECT * FROM `Ｔ８b` RIGHT JOIN `Ｔ８a` USING (`Ｃ１`); -Ｃ１ Ｃ１ -あ あ -NULL か -NULL さ +Ｃ１ +あ +か +さ SELECT * FROM `Ｔ８b` RIGHT JOIN `Ｔ８a` ON (`Ｔ８a`.`Ｃ１` = `Ｔ８b`.`Ｃ１`); Ｃ１ Ｃ１ あ あ @@ -400,31 +400,31 @@ 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 (`Ｃ１`); -Ｃ１ Ｃ１ -忢 忢 -忢 NULL -忢 NULL +Ｃ１ +忢 +忢 +忢 SELECT * FROM `Ｔ９a` LEFT JOIN `Ｔ９b` ON (`Ｔ９a`.`Ｃ１` = `Ｔ９b`.`Ｃ１`); Ｃ１ Ｃ１ 忢 忢 忢 NULL 忢 NULL SELECT * FROM `Ｔ９b` RIGHT JOIN `Ｔ９a` USING (`Ｃ１`); -Ｃ１ Ｃ１ -忢 忢 -NULL 忢 -NULL 忢 +Ｃ１ +忢 +忢 +忢 SELECT * FROM `Ｔ９b` RIGHT JOIN `Ｔ９a` ON (`Ｔ９a`.`Ｃ１` = `Ｔ９b`.`Ｃ１`); Ｃ１ Ｃ１ 忢 忢 @@ -441,31 +441,31 @@ 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 (`Ｃ１`); -Ｃ１ Ｃ１ -幈 幈 -幎 NULL -幓 NULL +Ｃ１ +幈 +幎 +幓 SELECT * FROM `Ｔ１０a` LEFT JOIN `Ｔ１０b` ON (`Ｔ１０a`.`Ｃ１` = `Ｔ１０b`.`Ｃ１`); Ｃ１ Ｃ１ 幈 幈 幎 NULL 幓 NULL SELECT * FROM `Ｔ１０b` RIGHT JOIN `Ｔ１０a` USING (`Ｃ１`); -Ｃ１ Ｃ１ -幈 幈 -NULL 幎 -NULL 幓 +Ｃ１ +幈 +幎 +幓 SELECT * FROM `Ｔ１０b` RIGHT JOIN `Ｔ１０a` ON (`Ｔ１０a`.`Ｃ１` = `Ｔ１０b`.`Ｃ１`); Ｃ１ Ｃ１ 幈 幈 @@ -482,31 +482,31 @@ 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 (`Ｃ１`); -Ｃ１ Ｃ１ -あ あ -か NULL -さ NULL +Ｃ１ +あ +か +さ SELECT * FROM `Ｔ１１a` LEFT JOIN `Ｔ１１b` ON (`Ｔ１１a`.`Ｃ１` = `Ｔ１１b`.`Ｃ１`); Ｃ１ Ｃ１ あ あ か NULL さ NULL SELECT * FROM `Ｔ１１b` RIGHT JOIN `Ｔ１１a` USING (`Ｃ１`); -Ｃ１ Ｃ１ -あ あ -NULL か -NULL さ +Ｃ１ +あ +か +さ SELECT * FROM `Ｔ１１b` RIGHT JOIN `Ｔ１１a` ON (`Ｔ１１a`.`Ｃ１` = `Ｔ１１b`.`Ｃ１`); Ｃ１ Ｃ１ あ あ @@ -523,31 +523,31 @@ 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 (`Ｃ１`); -Ｃ１ Ｃ１ -忢 忢 -忢 NULL -忢 NULL +Ｃ１ +忢 +忢 +忢 SELECT * FROM `Ｔ１２a` LEFT JOIN `Ｔ１２b` ON (`Ｔ１２a`.`Ｃ１` = `Ｔ１２b`.`Ｃ１`); Ｃ１ Ｃ１ 忢 忢 忢 NULL 忢 NULL SELECT * FROM `Ｔ１２b` RIGHT JOIN `Ｔ１２a` USING (`Ｃ１`); -Ｃ１ Ｃ１ -忢 忢 -NULL 忢 -NULL 忢 +Ｃ１ +忢 +忢 +忢 SELECT * FROM `Ｔ１２b` RIGHT JOIN `Ｔ１２a` ON (`Ｔ１２a`.`Ｃ１` = `Ｔ１２b`.`Ｃ１`); Ｃ１ Ｃ１ 忢 忢 diff --git a/mysql-test/suite/jp/r/jp_join_ujis.result b/mysql-test/suite/jp/r/jp_join_ujis.result index ac430cd9b5e..838d701cdcc 100644 --- a/mysql-test/suite/jp/r/jp_join_ujis.result +++ b/mysql-test/suite/jp/r/jp_join_ujis.result @@ -71,31 +71,31 @@ 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 (`Ｃ１`); -Ｃ１ Ｃ１ -幈 幈 -幎 NULL -幓 NULL +Ｃ１ +幈 +幎 +幓 SELECT * FROM `Ｔ１a` LEFT JOIN `Ｔ１b` ON (`Ｔ１a`.`Ｃ１` = `Ｔ１b`.`Ｃ１`); Ｃ１ Ｃ１ 幈 幈 幎 NULL 幓 NULL SELECT * FROM `Ｔ１b` RIGHT JOIN `Ｔ１a` USING (`Ｃ１`); -Ｃ１ Ｃ１ -幈 幈 -NULL 幎 -NULL 幓 +Ｃ１ +幈 +幎 +幓 SELECT * FROM `Ｔ１b` RIGHT JOIN `Ｔ１a` ON (`Ｔ１a`.`Ｃ１` = `Ｔ１b`.`Ｃ１`); Ｃ１ Ｃ１ 幈 幈 @@ -112,31 +112,31 @@ 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 (`Ｃ１`); -Ｃ１ Ｃ１ -あ あ -か NULL -さ NULL +Ｃ１ +あ +か +さ SELECT * FROM `Ｔ２a` LEFT JOIN `Ｔ２b` ON (`Ｔ２a`.`Ｃ１` = `Ｔ２b`.`Ｃ１`); Ｃ１ Ｃ１ あ あ か NULL さ NULL SELECT * FROM `Ｔ２b` RIGHT JOIN `Ｔ２a` USING (`Ｃ１`); -Ｃ１ Ｃ１ -あ あ -NULL か -NULL さ +Ｃ１ +あ +か +さ SELECT * FROM `Ｔ２b` RIGHT JOIN `Ｔ２a` ON (`Ｔ２a`.`Ｃ１` = `Ｔ２b`.`Ｃ１`); Ｃ１ Ｃ１ あ あ @@ -153,31 +153,31 @@ 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 (`Ｃ１`); -Ｃ１ Ｃ１ -忢 忢 -忢 NULL -忢 NULL +Ｃ１ +忢 +忢 +忢 SELECT * FROM `Ｔ３a` LEFT JOIN `Ｔ３b` ON (`Ｔ３a`.`Ｃ１` = `Ｔ３b`.`Ｃ１`); Ｃ１ Ｃ１ 忢 忢 忢 NULL 忢 NULL SELECT * FROM `Ｔ３b` RIGHT JOIN `Ｔ３a` USING (`Ｃ１`); -Ｃ１ Ｃ１ -忢 忢 -NULL 忢 -NULL 忢 +Ｃ１ +忢 +忢 +忢 SELECT * FROM `Ｔ３b` RIGHT JOIN `Ｔ３a` ON (`Ｔ３a`.`Ｃ１` = `Ｔ３b`.`Ｃ１`); Ｃ１ Ｃ１ 忢 忢 @@ -194,31 +194,31 @@ 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 (`Ｃ１`); -Ｃ１ Ｃ１ -幈 幈 -幎 NULL -幓 NULL +Ｃ１ +幈 +幎 +幓 SELECT * FROM `Ｔ４a` LEFT JOIN `Ｔ４b` ON (`Ｔ４a`.`Ｃ１` = `Ｔ４b`.`Ｃ１`); Ｃ１ Ｃ１ 幈 幈 幎 NULL 幓 NULL SELECT * FROM `Ｔ４b` RIGHT JOIN `Ｔ４a` USING (`Ｃ１`); -Ｃ１ Ｃ１ -幈 幈 -NULL 幎 -NULL 幓 +Ｃ１ +幈 +幎 +幓 SELECT * FROM `Ｔ４b` RIGHT JOIN `Ｔ４a` ON (`Ｔ４a`.`Ｃ１` = `Ｔ４b`.`Ｃ１`); Ｃ１ Ｃ１ 幈 幈 @@ -235,31 +235,31 @@ 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 (`Ｃ１`); -Ｃ１ Ｃ１ -あ あ -か NULL -さ NULL +Ｃ１ +あ +か +さ SELECT * FROM `Ｔ５a` LEFT JOIN `Ｔ５b` ON (`Ｔ５a`.`Ｃ１` = `Ｔ５b`.`Ｃ１`); Ｃ１ Ｃ１ あ あ か NULL さ NULL SELECT * FROM `Ｔ５b` RIGHT JOIN `Ｔ５a` USING (`Ｃ１`); -Ｃ１ Ｃ１ -あ あ -NULL か -NULL さ +Ｃ１ +あ +か +さ SELECT * FROM `Ｔ５b` RIGHT JOIN `Ｔ５a` ON (`Ｔ５a`.`Ｃ１` = `Ｔ５b`.`Ｃ１`); Ｃ１ Ｃ１ あ あ @@ -276,31 +276,31 @@ 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 (`Ｃ１`); -Ｃ１ Ｃ１ -忢 忢 -忢 NULL -忢 NULL +Ｃ１ +忢 +忢 +忢 SELECT * FROM `Ｔ６a` LEFT JOIN `Ｔ６b` ON (`Ｔ６a`.`Ｃ１` = `Ｔ６b`.`Ｃ１`); Ｃ１ Ｃ１ 忢 忢 忢 NULL 忢 NULL SELECT * FROM `Ｔ６b` RIGHT JOIN `Ｔ６a` USING (`Ｃ１`); -Ｃ１ Ｃ１ -忢 忢 -NULL 忢 -NULL 忢 +Ｃ１ +忢 +忢 +忢 SELECT * FROM `Ｔ６b` RIGHT JOIN `Ｔ６a` ON (`Ｔ６a`.`Ｃ１` = `Ｔ６b`.`Ｃ１`); Ｃ１ Ｃ１ 忢 忢 @@ -317,31 +317,31 @@ 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 (`Ｃ１`); -Ｃ１ Ｃ１ -幈 幈 -幎 NULL -幓 NULL +Ｃ１ +幈 +幎 +幓 SELECT * FROM `Ｔ７a` LEFT JOIN `Ｔ７b` ON (`Ｔ７a`.`Ｃ１` = `Ｔ７b`.`Ｃ１`); Ｃ１ Ｃ１ 幈 幈 幎 NULL 幓 NULL SELECT * FROM `Ｔ７b` RIGHT JOIN `Ｔ７a` USING (`Ｃ１`); -Ｃ１ Ｃ１ -幈 幈 -NULL 幎 -NULL 幓 +Ｃ１ +幈 +幎 +幓 SELECT * FROM `Ｔ７b` RIGHT JOIN `Ｔ７a` ON (`Ｔ７a`.`Ｃ１` = `Ｔ７b`.`Ｃ１`); Ｃ１ Ｃ１ 幈 幈 @@ -358,31 +358,31 @@ 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 (`Ｃ１`); -Ｃ１ Ｃ１ -あ あ -か NULL -さ NULL +Ｃ１ +あ +か +さ SELECT * FROM `Ｔ８a` LEFT JOIN `Ｔ８b` ON (`Ｔ８a`.`Ｃ１` = `Ｔ８b`.`Ｃ１`); Ｃ１ Ｃ１ あ あ か NULL さ NULL SELECT * FROM `Ｔ８b` RIGHT JOIN `Ｔ８a` USING (`Ｃ１`); -Ｃ１ Ｃ１ -あ あ -NULL か -NULL さ +Ｃ１ +あ +か +さ SELECT * FROM `Ｔ８b` RIGHT JOIN `Ｔ８a` ON (`Ｔ８a`.`Ｃ１` = `Ｔ８b`.`Ｃ１`); Ｃ１ Ｃ１ あ あ @@ -399,31 +399,31 @@ 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 (`Ｃ１`); -Ｃ１ Ｃ１ -忢 忢 -忢 NULL -忢 NULL +Ｃ１ +忢 +忢 +忢 SELECT * FROM `Ｔ９a` LEFT JOIN `Ｔ９b` ON (`Ｔ９a`.`Ｃ１` = `Ｔ９b`.`Ｃ１`); Ｃ１ Ｃ１ 忢 忢 忢 NULL 忢 NULL SELECT * FROM `Ｔ９b` RIGHT JOIN `Ｔ９a` USING (`Ｃ１`); -Ｃ１ Ｃ１ -忢 忢 -NULL 忢 -NULL 忢 +Ｃ１ +忢 +忢 +忢 SELECT * FROM `Ｔ９b` RIGHT JOIN `Ｔ９a` ON (`Ｔ９a`.`Ｃ１` = `Ｔ９b`.`Ｃ１`); Ｃ１ Ｃ１ 忢 忢 @@ -440,31 +440,31 @@ 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 (`Ｃ１`); -Ｃ１ Ｃ１ -幈 幈 -幎 NULL -幓 NULL +Ｃ１ +幈 +幎 +幓 SELECT * FROM `Ｔ１０a` LEFT JOIN `Ｔ１０b` ON (`Ｔ１０a`.`Ｃ１` = `Ｔ１０b`.`Ｃ１`); Ｃ１ Ｃ１ 幈 幈 幎 NULL 幓 NULL SELECT * FROM `Ｔ１０b` RIGHT JOIN `Ｔ１０a` USING (`Ｃ１`); -Ｃ１ Ｃ１ -幈 幈 -NULL 幎 -NULL 幓 +Ｃ１ +幈 +幎 +幓 SELECT * FROM `Ｔ１０b` RIGHT JOIN `Ｔ１０a` ON (`Ｔ１０a`.`Ｃ１` = `Ｔ１０b`.`Ｃ１`); Ｃ１ Ｃ１ 幈 幈 @@ -481,31 +481,31 @@ 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 (`Ｃ１`); -Ｃ１ Ｃ１ -あ あ -か NULL -さ NULL +Ｃ１ +あ +か +さ SELECT * FROM `Ｔ１１a` LEFT JOIN `Ｔ１１b` ON (`Ｔ１１a`.`Ｃ１` = `Ｔ１１b`.`Ｃ１`); Ｃ１ Ｃ１ あ あ か NULL さ NULL SELECT * FROM `Ｔ１１b` RIGHT JOIN `Ｔ１１a` USING (`Ｃ１`); -Ｃ１ Ｃ１ -あ あ -NULL か -NULL さ +Ｃ１ +あ +か +さ SELECT * FROM `Ｔ１１b` RIGHT JOIN `Ｔ１１a` ON (`Ｔ１１a`.`Ｃ１` = `Ｔ１１b`.`Ｃ１`); Ｃ１ Ｃ１ あ あ @@ -522,31 +522,31 @@ 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 (`Ｃ１`); -Ｃ１ Ｃ１ -忢 忢 -忢 NULL -忢 NULL +Ｃ１ +忢 +忢 +忢 SELECT * FROM `Ｔ１２a` LEFT JOIN `Ｔ１２b` ON (`Ｔ１２a`.`Ｃ１` = `Ｔ１２b`.`Ｃ１`); Ｃ１ Ｃ１ 忢 忢 忢 NULL 忢 NULL SELECT * FROM `Ｔ１２b` RIGHT JOIN `Ｔ１２a` USING (`Ｃ１`); -Ｃ１ Ｃ１ -忢 忢 -NULL 忢 -NULL 忢 +Ｃ１ +忢 +忢 +忢 SELECT * FROM `Ｔ１２b` RIGHT JOIN `Ｔ１２a` ON (`Ｔ１２a`.`Ｃ１` = `Ｔ１２b`.`Ｃ１`); Ｃ１ Ｃ１ 忢 忢 diff --git a/mysql-test/suite/jp/r/jp_join_utf8.result b/mysql-test/suite/jp/r/jp_join_utf8.result index 716e97a2bb3..8c222653c3e 100644 --- a/mysql-test/suite/jp/r/jp_join_utf8.result +++ b/mysql-test/suite/jp/r/jp_join_utf8.result @@ -71,31 +71,31 @@ 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 (`锛ｏ紤`); -锛ｏ紤 锛ｏ紤 -锝 锝 -锝 NULL -锝 NULL +锛ｏ紤 +锝 +锝 +锝 SELECT * FROM `锛达紤a` LEFT JOIN `锛达紤b` ON (`锛达紤a`.`锛ｏ紤` = `锛达紤b`.`锛ｏ紤`); 锛ｏ紤 锛ｏ紤 锝 锝 锝 NULL 锝 NULL SELECT * FROM `锛达紤b` RIGHT JOIN `锛达紤a` USING (`锛ｏ紤`); -锛ｏ紤 锛ｏ紤 -锝 锝 -NULL 锝 -NULL 锝 +锛ｏ紤 +锝 +锝 +锝 SELECT * FROM `锛达紤b` RIGHT JOIN `锛达紤a` ON (`锛达紤a`.`锛ｏ紤` = `锛达紤b`.`锛ｏ紤`); 锛ｏ紤 锛ｏ紤 锝 锝 @@ -112,31 +112,31 @@ 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 (`锛ｏ紤`); -锛ｏ紤 锛ｏ紤 -銇 銇 -銇 NULL -銇 NULL +锛ｏ紤 +銇 +銇 +銇 SELECT * FROM `锛达紥a` LEFT JOIN `锛达紥b` ON (`锛达紥a`.`锛ｏ紤` = `锛达紥b`.`锛ｏ紤`); 锛ｏ紤 锛ｏ紤 銇 銇 銇 NULL 銇 NULL SELECT * FROM `锛达紥b` RIGHT JOIN `锛达紥a` USING (`锛ｏ紤`); -锛ｏ紤 锛ｏ紤 -銇 銇 -NULL 銇 -NULL 銇 +锛ｏ紤 +銇 +銇 +銇 SELECT * FROM `锛达紥b` RIGHT JOIN `锛达紥a` ON (`锛达紥a`.`锛ｏ紤` = `锛达紥b`.`锛ｏ紤`); 锛ｏ紤 锛ｏ紤 銇 銇 @@ -153,31 +153,31 @@ 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 (`锛ｏ紤`); -锛ｏ紤 锛ｏ紤 -榫 榫 -榫 NULL -榫 NULL +锛ｏ紤 +榫 +榫 +榫 SELECT * FROM `锛达紦a` LEFT JOIN `锛达紦b` ON (`锛达紦a`.`锛ｏ紤` = `锛达紦b`.`锛ｏ紤`); 锛ｏ紤 锛ｏ紤 榫 榫 榫 NULL 榫 NULL SELECT * FROM `锛达紦b` RIGHT JOIN `锛达紦a` USING (`锛ｏ紤`); -锛ｏ紤 锛ｏ紤 -榫 榫 -NULL 榫 -NULL 榫 +锛ｏ紤 +榫 +榫 +榫 SELECT * FROM `锛达紦b` RIGHT JOIN `锛达紦a` ON (`锛达紦a`.`锛ｏ紤` = `锛达紦b`.`锛ｏ紤`); 锛ｏ紤 锛ｏ紤 榫 榫 @@ -194,31 +194,31 @@ 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 (`锛ｏ紤`); -锛ｏ紤 锛ｏ紤 -锝 锝 -锝 NULL -锝 NULL +锛ｏ紤 +锝 +锝 +锝 SELECT * FROM `锛达紨a` LEFT JOIN `锛达紨b` ON (`锛达紨a`.`锛ｏ紤` = `锛达紨b`.`锛ｏ紤`); 锛ｏ紤 锛ｏ紤 锝 锝 锝 NULL 锝 NULL SELECT * FROM `锛达紨b` RIGHT JOIN `锛达紨a` USING (`锛ｏ紤`); -锛ｏ紤 锛ｏ紤 -锝 锝 -NULL 锝 -NULL 锝 +锛ｏ紤 +锝 +锝 +锝 SELECT * FROM `锛达紨b` RIGHT JOIN `锛达紨a` ON (`锛达紨a`.`锛ｏ紤` = `锛达紨b`.`锛ｏ紤`); 锛ｏ紤 锛ｏ紤 锝 锝 @@ -235,31 +235,31 @@ 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 (`锛ｏ紤`); -锛ｏ紤 锛ｏ紤 -銇 銇 -銇 NULL -銇 NULL +锛ｏ紤 +銇 +銇 +銇 SELECT * FROM `锛达紩a` LEFT JOIN `锛达紩b` ON (`锛达紩a`.`锛ｏ紤` = `锛达紩b`.`锛ｏ紤`); 锛ｏ紤 锛ｏ紤 銇 銇 銇 NULL 銇 NULL SELECT * FROM `锛达紩b` RIGHT JOIN `锛达紩a` USING (`锛ｏ紤`); -锛ｏ紤 锛ｏ紤 -銇 銇 -NULL 銇 -NULL 銇 +锛ｏ紤 +銇 +銇 +銇 SELECT * FROM `锛达紩b` RIGHT JOIN `锛达紩a` ON (`锛达紩a`.`锛ｏ紤` = `锛达紩b`.`锛ｏ紤`); 锛ｏ紤 锛ｏ紤 銇 銇 @@ -276,31 +276,31 @@ 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 (`锛ｏ紤`); -锛ｏ紤 锛ｏ紤 -榫 榫 -榫 NULL -榫 NULL +锛ｏ紤 +榫 +榫 +榫 SELECT * FROM `锛达紪a` LEFT JOIN `锛达紪b` ON (`锛达紪a`.`锛ｏ紤` = `锛达紪b`.`锛ｏ紤`); 锛ｏ紤 锛ｏ紤 榫 榫 榫 NULL 榫 NULL SELECT * FROM `锛达紪b` RIGHT JOIN `锛达紪a` USING (`锛ｏ紤`); -锛ｏ紤 锛ｏ紤 -榫 榫 -NULL 榫 -NULL 榫 +锛ｏ紤 +榫 +榫 +榫 SELECT * FROM `锛达紪b` RIGHT JOIN `锛达紪a` ON (`锛达紪a`.`锛ｏ紤` = `锛达紪b`.`锛ｏ紤`); 锛ｏ紤 锛ｏ紤 榫 榫 @@ -317,31 +317,31 @@ 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 (`锛ｏ紤`); -锛ｏ紤 锛ｏ紤 -锝 锝 -锝 NULL -锝 NULL +锛ｏ紤 +锝 +锝 +锝 SELECT * FROM `锛达紬a` LEFT JOIN `锛达紬b` ON (`锛达紬a`.`锛ｏ紤` = `锛达紬b`.`锛ｏ紤`); 锛ｏ紤 锛ｏ紤 锝 锝 锝 NULL 锝 NULL SELECT * FROM `锛达紬b` RIGHT JOIN `锛达紬a` USING (`锛ｏ紤`); -锛ｏ紤 锛ｏ紤 -锝 锝 -NULL 锝 -NULL 锝 +锛ｏ紤 +锝 +锝 +锝 SELECT * FROM `锛达紬b` RIGHT JOIN `锛达紬a` ON (`锛达紬a`.`锛ｏ紤` = `锛达紬b`.`锛ｏ紤`); 锛ｏ紤 锛ｏ紤 锝 锝 @@ -358,31 +358,31 @@ 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 (`锛ｏ紤`); -锛ｏ紤 锛ｏ紤 -銇 銇 -銇 NULL -銇 NULL +锛ｏ紤 +銇 +銇 +銇 SELECT * FROM `锛达紭a` LEFT JOIN `锛达紭b` ON (`锛达紭a`.`锛ｏ紤` = `锛达紭b`.`锛ｏ紤`); 锛ｏ紤 锛ｏ紤 銇 銇 銇 NULL 銇 NULL SELECT * FROM `锛达紭b` RIGHT JOIN `锛达紭a` USING (`锛ｏ紤`); -锛ｏ紤 锛ｏ紤 -銇 銇 -NULL 銇 -NULL 銇 +锛ｏ紤 +銇 +銇 +銇 SELECT * FROM `锛达紭b` RIGHT JOIN `锛达紭a` ON (`锛达紭a`.`锛ｏ紤` = `锛达紭b`.`锛ｏ紤`); 锛ｏ紤 锛ｏ紤 銇 銇 @@ -399,31 +399,31 @@ 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 (`锛ｏ紤`); -锛ｏ紤 锛ｏ紤 -榫 榫 -榫 NULL -榫 NULL +锛ｏ紤 +榫 +榫 +榫 SELECT * FROM `锛达紮a` LEFT JOIN `锛达紮b` ON (`锛达紮a`.`锛ｏ紤` = `锛达紮b`.`锛ｏ紤`); 锛ｏ紤 锛ｏ紤 榫 榫 榫 NULL 榫 NULL SELECT * FROM `锛达紮b` RIGHT JOIN `锛达紮a` USING (`锛ｏ紤`); -锛ｏ紤 锛ｏ紤 -榫 榫 -NULL 榫 -NULL 榫 +锛ｏ紤 +榫 +榫 +榫 SELECT * FROM `锛达紮b` RIGHT JOIN `锛达紮a` ON (`锛达紮a`.`锛ｏ紤` = `锛达紮b`.`锛ｏ紤`); 锛ｏ紤 锛ｏ紤 榫 榫 @@ -440,31 +440,31 @@ SELECT * FROM `锛达紤锛恆` INNER JOIN `锛达紤锛恇`; 锝 锝 锝 锝 SELECT * FROM `锛达紤锛恆` JOIN `锛达紤锛恇` USING (`锛ｏ紤`); -锛ｏ紤 锛ｏ紤 -锝 锝 +锛ｏ紤 +锝 SELECT * FROM `锛达紤锛恆` INNER JOIN `锛达紤锛恇` USING (`锛ｏ紤`); -锛ｏ紤 锛ｏ紤 -锝 锝 +锛ｏ紤 +锝 SELECT * FROM `锛达紤锛恆` CROSS JOIN `锛达紤锛恇`; 锛ｏ紤 锛ｏ紤 锝 锝 锝 锝 锝 锝 SELECT * FROM `锛达紤锛恆` LEFT JOIN `锛达紤锛恇` USING (`锛ｏ紤`); -锛ｏ紤 锛ｏ紤 -锝 锝 -锝 NULL -锝 NULL +锛ｏ紤 +锝 +锝 +锝 SELECT * FROM `锛达紤锛恆` LEFT JOIN `锛达紤锛恇` ON (`锛达紤锛恆`.`锛ｏ紤` = `锛达紤锛恇`.`锛ｏ紤`); 锛ｏ紤 锛ｏ紤 锝 锝 锝 NULL 锝 NULL SELECT * FROM `锛达紤锛恇` RIGHT JOIN `锛达紤锛恆` USING (`锛ｏ紤`); -锛ｏ紤 锛ｏ紤 -锝 锝 -NULL 锝 -NULL 锝 +锛ｏ紤 +锝 +锝 +锝 SELECT * FROM `锛达紤锛恇` RIGHT JOIN `锛达紤锛恆` ON (`锛达紤锛恆`.`锛ｏ紤` = `锛达紤锛恇`.`锛ｏ紤`); 锛ｏ紤 锛ｏ紤 锝 锝 @@ -481,31 +481,31 @@ SELECT * FROM `锛达紤锛慳` INNER JOIN `锛达紤锛慴`; 銇 銇 銇 銇 SELECT * FROM `锛达紤锛慳` JOIN `锛达紤锛慴` USING (`锛ｏ紤`); -锛ｏ紤 锛ｏ紤 -銇 銇 +锛ｏ紤 +銇 SELECT * FROM `锛达紤锛慳` INNER JOIN `锛达紤锛慴` USING (`锛ｏ紤`); -锛ｏ紤 锛ｏ紤 -銇 銇 +锛ｏ紤 +銇 SELECT * FROM `锛达紤锛慳` CROSS JOIN `锛达紤锛慴`; 锛ｏ紤 锛ｏ紤 銇 銇 銇 銇 銇 銇 SELECT * FROM `锛达紤锛慳` LEFT JOIN `锛达紤锛慴` USING (`锛ｏ紤`); -锛ｏ紤 锛ｏ紤 -銇 銇 -銇 NULL -銇 NULL +锛ｏ紤 +銇 +銇 +銇 SELECT * FROM `锛达紤锛慳` LEFT JOIN `锛达紤锛慴` ON (`锛达紤锛慳`.`锛ｏ紤` = `锛达紤锛慴`.`锛ｏ紤`); 锛ｏ紤 锛ｏ紤 銇 銇 銇 NULL 銇 NULL SELECT * FROM `锛达紤锛慴` RIGHT JOIN `锛达紤锛慳` USING (`锛ｏ紤`); -锛ｏ紤 锛ｏ紤 -銇 銇 -NULL 銇 -NULL 銇 +锛ｏ紤 +銇 +銇 +銇 SELECT * FROM `锛达紤锛慴` RIGHT JOIN `锛达紤锛慳` ON (`锛达紤锛慳`.`锛ｏ紤` = `锛达紤锛慴`.`锛ｏ紤`); 锛ｏ紤 锛ｏ紤 銇 銇 @@ -522,31 +522,31 @@ SELECT * FROM `锛达紤锛抋` INNER JOIN `锛达紤锛抌`; 榫 榫 榫 榫 SELECT * FROM `锛达紤锛抋` JOIN `锛达紤锛抌` USING (`锛ｏ紤`); -锛ｏ紤 锛ｏ紤 -榫 榫 +锛ｏ紤 +榫 SELECT * FROM `锛达紤锛抋` INNER JOIN `锛达紤锛抌` USING (`锛ｏ紤`); -锛ｏ紤 锛ｏ紤 -榫 榫 +锛ｏ紤 +榫 SELECT * FROM `锛达紤锛抋` CROSS JOIN `锛达紤锛抌`; 锛ｏ紤 锛ｏ紤 榫 榫 榫 榫 榫 榫 SELECT * FROM `锛达紤锛抋` LEFT JOIN `锛达紤锛抌` USING (`锛ｏ紤`); -锛ｏ紤 锛ｏ紤 -榫 榫 -榫 NULL -榫 NULL +锛ｏ紤 +榫 +榫 +榫 SELECT * FROM `锛达紤锛抋` LEFT JOIN `锛达紤锛抌` ON (`锛达紤锛抋`.`锛ｏ紤` = `锛达紤锛抌`.`锛ｏ紤`); 锛ｏ紤 锛ｏ紤 榫 榫 榫 NULL 榫 NULL SELECT * FROM `锛达紤锛抌` RIGHT JOIN `锛达紤锛抋` USING (`锛ｏ紤`); -锛ｏ紤 锛ｏ紤 -榫 榫 -NULL 榫 -NULL 榫 +锛ｏ紤 +榫 +榫 +榫 SELECT * FROM `锛达紤锛抌` RIGHT JOIN `锛达紤锛抋` ON (`锛达紤锛抋`.`锛ｏ紤` = `锛达紤锛抌`.`锛ｏ紤`); 锛ｏ紤 锛ｏ紤 榫 榫 diff --git a/mysql-test/suite/jp/r/jp_select_sjis.result b/mysql-test/suite/jp/r/jp_select_sjis.result index d48d08d745f..652b538fb88 100644 --- a/mysql-test/suite/jp/r/jp_select_sjis.result +++ b/mysql-test/suite/jp/r/jp_select_sjis.result @@ -118,6 +118,7 @@ SELECT * FROM `俿俀`; 陳陸陹険陻陼陽陾陿隀隁隂隃隄隇丒丒丒丒丒 SELECT * FROM `俿俁`; 俠侾 + 僜廫昞梊峔塡嶾怽揬擻朶榎慭抃橽歕沑淺漒瀄 SELECT * FROM `俿係`; 俠侾 @@ -201,6 +202,7 @@ SELECT * FROM `俿俆`; 陳陸陹険陻陼陽陾陿隀隁隂隃隄隇丒丒丒丒丒 SELECT * FROM `俿俇`; 俠侾 + 僜廫昞梊峔塡嶾怽揬擻朶榎慭抃橽歕沑淺漒瀄 SELECT * FROM `俿俈`; 俠侾 @@ -285,6 +287,7 @@ SELECT * FROM `俿俉`; SELECT * FROM `俿俋`; 俠侾 僜廫昞梊峔塡嶾怽揬擻朶榎慭抃橽歕沑淺漒瀄 + SELECT * FROM `俿侾侽`; 俠侾 !"#$%&'()*+,-./ @@ -368,6 +371,7 @@ SELECT * FROM `俿侾侾`; SELECT * FROM `俿侾俀`; 俠侾 僜廫昞梊峔塡嶾怽揬擻朶榎慭抃橽歕沑淺漒瀄 + drop table `俿侾`; drop table `俿俀`; drop table `俿俁`; diff --git a/mysql-test/suite/jp/t/jp_alter_sjis.test b/mysql-test/suite/jp/t/jp_alter_sjis.test index b7b31862599..f250afcf5dd 100644 --- a/mysql-test/suite/jp/t/jp_alter_sjis.test +++ b/mysql-test/suite/jp/t/jp_alter_sjis.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --character_set sjis SET NAMES sjis; SET character_set_database = sjis; diff --git a/mysql-test/suite/jp/t/jp_alter_ucs2.test b/mysql-test/suite/jp/t/jp_alter_ucs2.test index 6c5b3132edf..27cf5b72839 100644 --- a/mysql-test/suite/jp/t/jp_alter_ucs2.test +++ b/mysql-test/suite/jp/t/jp_alter_ucs2.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --source include/have_ucs2.inc --disable_warnings diff --git a/mysql-test/suite/jp/t/jp_alter_ujis.test b/mysql-test/suite/jp/t/jp_alter_ujis.test index d388d20c49b..b817f608446 100644 --- a/mysql-test/suite/jp/t/jp_alter_ujis.test +++ b/mysql-test/suite/jp/t/jp_alter_ujis.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --source include/have_ujis.inc --disable_warnings diff --git a/mysql-test/suite/jp/t/jp_alter_utf8.test b/mysql-test/suite/jp/t/jp_alter_utf8.test index 6771343f38f..60a67485ba5 100644 --- a/mysql-test/suite/jp/t/jp_alter_utf8.test +++ b/mysql-test/suite/jp/t/jp_alter_utf8.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --disable_warnings DROP TABLE IF EXISTS `锝憋奖锝盽; DROP TABLE IF EXISTS `锝诧讲锝瞏; diff --git a/mysql-test/suite/jp/t/jp_charlength_sjis.test b/mysql-test/suite/jp/t/jp_charlength_sjis.test index 5f3543bb7a6..350605450da 100644 --- a/mysql-test/suite/jp/t/jp_charlength_sjis.test +++ b/mysql-test/suite/jp/t/jp_charlength_sjis.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --character_set sjis --disable_warnings drop table if exists `俿侾`; diff --git a/mysql-test/suite/jp/t/jp_charlength_ucs2.test b/mysql-test/suite/jp/t/jp_charlength_ucs2.test index 2db9db7cfc6..714ced47ff8 100644 --- a/mysql-test/suite/jp/t/jp_charlength_ucs2.test +++ b/mysql-test/suite/jp/t/jp_charlength_ucs2.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --source include/have_ucs2.inc --disable_warnings diff --git a/mysql-test/suite/jp/t/jp_charlength_ujis.test b/mysql-test/suite/jp/t/jp_charlength_ujis.test index 08973231f27..923bffef540 100644 --- a/mysql-test/suite/jp/t/jp_charlength_ujis.test +++ b/mysql-test/suite/jp/t/jp_charlength_ujis.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --source include/have_ujis.inc --disable_warnings diff --git a/mysql-test/suite/jp/t/jp_charlength_utf8.test b/mysql-test/suite/jp/t/jp_charlength_utf8.test index a3f74db27ee..bc099caf74a 100644 --- a/mysql-test/suite/jp/t/jp_charlength_utf8.test +++ b/mysql-test/suite/jp/t/jp_charlength_utf8.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --disable_warnings drop table if exists `锛达紤`; drop table if exists `锛达紥`; diff --git a/mysql-test/suite/jp/t/jp_charset_sjis.test b/mysql-test/suite/jp/t/jp_charset_sjis.test index 3a9f264bdfe..276be86cd9d 100644 --- a/mysql-test/suite/jp/t/jp_charset_sjis.test +++ b/mysql-test/suite/jp/t/jp_charset_sjis.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --character_set sjis --disable_warnings drop table if exists `俿侾`; diff --git a/mysql-test/suite/jp/t/jp_charset_ucs2.test b/mysql-test/suite/jp/t/jp_charset_ucs2.test index 5183071033b..f7971095fa6 100644 --- a/mysql-test/suite/jp/t/jp_charset_ucs2.test +++ b/mysql-test/suite/jp/t/jp_charset_ucs2.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --source include/have_ucs2.inc --disable_warnings diff --git a/mysql-test/suite/jp/t/jp_charset_ujis.test b/mysql-test/suite/jp/t/jp_charset_ujis.test index de9ef318530..a8a6544537a 100644 --- a/mysql-test/suite/jp/t/jp_charset_ujis.test +++ b/mysql-test/suite/jp/t/jp_charset_ujis.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --source include/have_ujis.inc --disable_warnings diff --git a/mysql-test/suite/jp/t/jp_charset_utf8.test b/mysql-test/suite/jp/t/jp_charset_utf8.test index 2d73daba42a..7d8311c2f72 100644 --- a/mysql-test/suite/jp/t/jp_charset_utf8.test +++ b/mysql-test/suite/jp/t/jp_charset_utf8.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --disable_warnings drop table if exists `锛达紤`; drop table if exists `锛达紥`; diff --git a/mysql-test/suite/jp/t/jp_convert_sjis.test b/mysql-test/suite/jp/t/jp_convert_sjis.test index 93fa33029bf..835328c92eb 100644 --- a/mysql-test/suite/jp/t/jp_convert_sjis.test +++ b/mysql-test/suite/jp/t/jp_convert_sjis.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --character_set sjis SET NAMES sjis; SET character_set_database = sjis; diff --git a/mysql-test/suite/jp/t/jp_convert_ucs2.test b/mysql-test/suite/jp/t/jp_convert_ucs2.test index 88b0d0c9cba..3ed4efe158d 100644 --- a/mysql-test/suite/jp/t/jp_convert_ucs2.test +++ b/mysql-test/suite/jp/t/jp_convert_ucs2.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --source include/have_ucs2.inc --disable_warnings diff --git a/mysql-test/suite/jp/t/jp_convert_ujis.test b/mysql-test/suite/jp/t/jp_convert_ujis.test index d6303b66f34..4409b6cad90 100644 --- a/mysql-test/suite/jp/t/jp_convert_ujis.test +++ b/mysql-test/suite/jp/t/jp_convert_ujis.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --source include/have_ujis.inc --disable_warnings diff --git a/mysql-test/suite/jp/t/jp_convert_utf8.test b/mysql-test/suite/jp/t/jp_convert_utf8.test index a687b0f06cb..e7c180e72fc 100644 --- a/mysql-test/suite/jp/t/jp_convert_utf8.test +++ b/mysql-test/suite/jp/t/jp_convert_utf8.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --disable_warnings drop table if exists `锛达紤`; drop table if exists `锛达紥`; diff --git a/mysql-test/suite/jp/t/jp_create_tbl_sjis.test b/mysql-test/suite/jp/t/jp_create_tbl_sjis.test index 45c0b24388b..93f3ac3c4a3 100644 --- a/mysql-test/suite/jp/t/jp_create_tbl_sjis.test +++ b/mysql-test/suite/jp/t/jp_create_tbl_sjis.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --character_set sjis SET NAMES sjis; SET character_set_database = sjis; diff --git a/mysql-test/suite/jp/t/jp_create_tbl_ucs2.test b/mysql-test/suite/jp/t/jp_create_tbl_ucs2.test index 519697e3530..553ef8a4dad 100644 --- a/mysql-test/suite/jp/t/jp_create_tbl_ucs2.test +++ b/mysql-test/suite/jp/t/jp_create_tbl_ucs2.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --source include/have_ucs2.inc --disable_warnings diff --git a/mysql-test/suite/jp/t/jp_create_tbl_ujis.test b/mysql-test/suite/jp/t/jp_create_tbl_ujis.test index ac70facdce9..1106ddc1417 100644 --- a/mysql-test/suite/jp/t/jp_create_tbl_ujis.test +++ b/mysql-test/suite/jp/t/jp_create_tbl_ujis.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --source include/have_ujis.inc --disable_warnings diff --git a/mysql-test/suite/jp/t/jp_create_tbl_utf8.test b/mysql-test/suite/jp/t/jp_create_tbl_utf8.test index 5c816eb169a..9b0ece77e34 100644 --- a/mysql-test/suite/jp/t/jp_create_tbl_utf8.test +++ b/mysql-test/suite/jp/t/jp_create_tbl_utf8.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --disable_warnings DROP TABLE IF EXISTS `锝憋奖锝盽; DROP TABLE IF EXISTS `锝诧讲锝瞏; diff --git a/mysql-test/suite/jp/t/jp_enum_sjis.test b/mysql-test/suite/jp/t/jp_enum_sjis.test index 2ea1bf320e0..c433e0bcac4 100644 --- a/mysql-test/suite/jp/t/jp_enum_sjis.test +++ b/mysql-test/suite/jp/t/jp_enum_sjis.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --character_set sjis --disable_warnings drop table if exists `俿侾`; diff --git a/mysql-test/suite/jp/t/jp_enum_ucs2.test b/mysql-test/suite/jp/t/jp_enum_ucs2.test index 2239ebab478..79f5952cf97 100644 --- a/mysql-test/suite/jp/t/jp_enum_ucs2.test +++ b/mysql-test/suite/jp/t/jp_enum_ucs2.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --source include/have_ucs2.inc # half-with kana is not handled correctly in 4.1 diff --git a/mysql-test/suite/jp/t/jp_enum_ujis.test b/mysql-test/suite/jp/t/jp_enum_ujis.test index da41165aad0..f48d176ec6b 100644 --- a/mysql-test/suite/jp/t/jp_enum_ujis.test +++ b/mysql-test/suite/jp/t/jp_enum_ujis.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --source include/have_ujis.inc --disable_warnings diff --git a/mysql-test/suite/jp/t/jp_enum_utf8.test b/mysql-test/suite/jp/t/jp_enum_utf8.test index 4ce3576b604..64fe2129164 100644 --- a/mysql-test/suite/jp/t/jp_enum_utf8.test +++ b/mysql-test/suite/jp/t/jp_enum_utf8.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --disable_warnings drop table if exists `锛达紤`; drop table if exists `锛达紥`; diff --git a/mysql-test/suite/jp/t/jp_insert_sjis.test b/mysql-test/suite/jp/t/jp_insert_sjis.test index 0266ad1eaca..a940eeb5782 100644 --- a/mysql-test/suite/jp/t/jp_insert_sjis.test +++ b/mysql-test/suite/jp/t/jp_insert_sjis.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --character_set sjis --disable_warnings drop table if exists `俿侾`; diff --git a/mysql-test/suite/jp/t/jp_insert_ucs2.test b/mysql-test/suite/jp/t/jp_insert_ucs2.test index 9b0a02e57d8..443f6f1107b 100644 --- a/mysql-test/suite/jp/t/jp_insert_ucs2.test +++ b/mysql-test/suite/jp/t/jp_insert_ucs2.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --source include/have_ucs2.inc --disable_warnings diff --git a/mysql-test/suite/jp/t/jp_insert_ujis.test b/mysql-test/suite/jp/t/jp_insert_ujis.test index 7b6d2838386..ab82db59326 100644 --- a/mysql-test/suite/jp/t/jp_insert_ujis.test +++ b/mysql-test/suite/jp/t/jp_insert_ujis.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --source include/have_ujis.inc --disable_warnings diff --git a/mysql-test/suite/jp/t/jp_insert_utf8.test b/mysql-test/suite/jp/t/jp_insert_utf8.test index ef6acb90063..e8c41bab4ea 100644 --- a/mysql-test/suite/jp/t/jp_insert_utf8.test +++ b/mysql-test/suite/jp/t/jp_insert_utf8.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --disable_warnings drop table if exists `锛达紤`; drop table if exists `锛达紥`; diff --git a/mysql-test/suite/jp/t/jp_instr_sjis.test b/mysql-test/suite/jp/t/jp_instr_sjis.test index c19b5f2b14c..83480ea0267 100644 --- a/mysql-test/suite/jp/t/jp_instr_sjis.test +++ b/mysql-test/suite/jp/t/jp_instr_sjis.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --character_set sjis --disable_warnings drop table if exists `俿侾`; diff --git a/mysql-test/suite/jp/t/jp_instr_ucs2.test b/mysql-test/suite/jp/t/jp_instr_ucs2.test index b8f83961e90..7b442d09a3d 100644 --- a/mysql-test/suite/jp/t/jp_instr_ucs2.test +++ b/mysql-test/suite/jp/t/jp_instr_ucs2.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --source include/have_ucs2.inc --disable_warnings diff --git a/mysql-test/suite/jp/t/jp_instr_ujis.test b/mysql-test/suite/jp/t/jp_instr_ujis.test index 696e1147372..d0373ba73ce 100644 --- a/mysql-test/suite/jp/t/jp_instr_ujis.test +++ b/mysql-test/suite/jp/t/jp_instr_ujis.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --source include/have_ujis.inc --disable_warnings diff --git a/mysql-test/suite/jp/t/jp_instr_utf8.test b/mysql-test/suite/jp/t/jp_instr_utf8.test index b25b72bc8d0..c7491101872 100644 --- a/mysql-test/suite/jp/t/jp_instr_utf8.test +++ b/mysql-test/suite/jp/t/jp_instr_utf8.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --disable_warnings drop table if exists `锛达紤`; drop table if exists `锛达紥`; diff --git a/mysql-test/suite/jp/t/jp_join_sjis.test b/mysql-test/suite/jp/t/jp_join_sjis.test index 30b23913929..77d1dc15c5c 100644 --- a/mysql-test/suite/jp/t/jp_join_sjis.test +++ b/mysql-test/suite/jp/t/jp_join_sjis.test @@ -1,3 +1,4 @@ +-- source include/have_innodb.inc --character_set sjis --disable_warnings drop table if exists `俿侾`; diff --git a/mysql-test/suite/jp/t/jp_join_ucs2.test b/mysql-test/suite/jp/t/jp_join_ucs2.test index 27e49203dd2..276af80f7af 100644 --- a/mysql-test/suite/jp/t/jp_join_ucs2.test +++ b/mysql-test/suite/jp/t/jp_join_ucs2.test @@ -1,3 +1,4 @@ +-- source include/have_innodb.inc --source include/have_ucs2.inc --disable_warnings diff --git a/mysql-test/suite/jp/t/jp_join_ujis.test b/mysql-test/suite/jp/t/jp_join_ujis.test index 079f260cc26..5716ee12e60 100644 --- a/mysql-test/suite/jp/t/jp_join_ujis.test +++ b/mysql-test/suite/jp/t/jp_join_ujis.test @@ -1,3 +1,4 @@ +-- source include/have_innodb.inc --source include/have_ujis.inc --disable_warnings diff --git a/mysql-test/suite/jp/t/jp_join_utf8.test b/mysql-test/suite/jp/t/jp_join_utf8.test index 0b2f033f8bb..36f8e930bc3 100644 --- a/mysql-test/suite/jp/t/jp_join_utf8.test +++ b/mysql-test/suite/jp/t/jp_join_utf8.test @@ -1,3 +1,4 @@ +-- source include/have_innodb.inc --disable_warnings drop table if exists `锛达紤`; drop table if exists `锛达紥`; diff --git a/mysql-test/suite/jp/t/jp_left_sjis.test b/mysql-test/suite/jp/t/jp_left_sjis.test index 5d69d9892e2..e93e92493a1 100644 --- a/mysql-test/suite/jp/t/jp_left_sjis.test +++ b/mysql-test/suite/jp/t/jp_left_sjis.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --character_set sjis --disable_warnings drop table if exists `俿侾`; diff --git a/mysql-test/suite/jp/t/jp_left_ucs2.test b/mysql-test/suite/jp/t/jp_left_ucs2.test index 59d10b7d736..2c1be4a7e6a 100644 --- a/mysql-test/suite/jp/t/jp_left_ucs2.test +++ b/mysql-test/suite/jp/t/jp_left_ucs2.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --source include/have_ucs2.inc --disable_warnings diff --git a/mysql-test/suite/jp/t/jp_left_ujis.test b/mysql-test/suite/jp/t/jp_left_ujis.test index 718639cd8a4..f639bf643df 100644 --- a/mysql-test/suite/jp/t/jp_left_ujis.test +++ b/mysql-test/suite/jp/t/jp_left_ujis.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --source include/have_ujis.inc --disable_warnings diff --git a/mysql-test/suite/jp/t/jp_left_utf8.test b/mysql-test/suite/jp/t/jp_left_utf8.test index f9c99718e0f..63d9061a879 100644 --- a/mysql-test/suite/jp/t/jp_left_utf8.test +++ b/mysql-test/suite/jp/t/jp_left_utf8.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --disable_warnings drop table if exists `锛达紤`; drop table if exists `锛达紥`; diff --git a/mysql-test/suite/jp/t/jp_length_sjis.test b/mysql-test/suite/jp/t/jp_length_sjis.test index 7023891b7f0..81121a4432e 100644 --- a/mysql-test/suite/jp/t/jp_length_sjis.test +++ b/mysql-test/suite/jp/t/jp_length_sjis.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --character_set sjis --disable_warnings drop table if exists `俿侾`; diff --git a/mysql-test/suite/jp/t/jp_length_ucs2.test b/mysql-test/suite/jp/t/jp_length_ucs2.test index 9951c9b6cd1..1dcc975d868 100644 --- a/mysql-test/suite/jp/t/jp_length_ucs2.test +++ b/mysql-test/suite/jp/t/jp_length_ucs2.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --source include/have_ucs2.inc --disable_warnings diff --git a/mysql-test/suite/jp/t/jp_length_ujis.test b/mysql-test/suite/jp/t/jp_length_ujis.test index ac3aef2c768..ad41c7a7113 100644 --- a/mysql-test/suite/jp/t/jp_length_ujis.test +++ b/mysql-test/suite/jp/t/jp_length_ujis.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --source include/have_ujis.inc --disable_warnings diff --git a/mysql-test/suite/jp/t/jp_length_utf8.test b/mysql-test/suite/jp/t/jp_length_utf8.test index 5c5021f37be..7bfe1896034 100644 --- a/mysql-test/suite/jp/t/jp_length_utf8.test +++ b/mysql-test/suite/jp/t/jp_length_utf8.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --disable_warnings drop table if exists `锛达紤`; drop table if exists `锛达紥`; diff --git a/mysql-test/suite/jp/t/jp_like_sjis.test b/mysql-test/suite/jp/t/jp_like_sjis.test index 5c41b9ff7ef..1cb7aadb876 100644 --- a/mysql-test/suite/jp/t/jp_like_sjis.test +++ b/mysql-test/suite/jp/t/jp_like_sjis.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --character_set sjis --disable_warnings drop table if exists `俿侾`; diff --git a/mysql-test/suite/jp/t/jp_like_ucs2.test b/mysql-test/suite/jp/t/jp_like_ucs2.test index feae40de49e..1f9b7c09b9d 100644 --- a/mysql-test/suite/jp/t/jp_like_ucs2.test +++ b/mysql-test/suite/jp/t/jp_like_ucs2.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --source include/have_ucs2.inc --disable_warnings diff --git a/mysql-test/suite/jp/t/jp_like_ujis.test b/mysql-test/suite/jp/t/jp_like_ujis.test index 29ef7c5d48b..56c4fa8a8b0 100644 --- a/mysql-test/suite/jp/t/jp_like_ujis.test +++ b/mysql-test/suite/jp/t/jp_like_ujis.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --source include/have_ujis.inc --disable_warnings diff --git a/mysql-test/suite/jp/t/jp_like_utf8.test b/mysql-test/suite/jp/t/jp_like_utf8.test index 4247242029d..f6cc895d814 100644 --- a/mysql-test/suite/jp/t/jp_like_utf8.test +++ b/mysql-test/suite/jp/t/jp_like_utf8.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --disable_warnings drop table if exists `锛达紤`; drop table if exists `锛达紥`; diff --git a/mysql-test/suite/jp/t/jp_locate_sjis.test b/mysql-test/suite/jp/t/jp_locate_sjis.test index 92c671199b6..a015109e2a3 100644 --- a/mysql-test/suite/jp/t/jp_locate_sjis.test +++ b/mysql-test/suite/jp/t/jp_locate_sjis.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --character_set sjis --disable_warnings drop table if exists `俿侾`; diff --git a/mysql-test/suite/jp/t/jp_locate_ucs2.test b/mysql-test/suite/jp/t/jp_locate_ucs2.test index d00ad67235a..111caefb02e 100644 --- a/mysql-test/suite/jp/t/jp_locate_ucs2.test +++ b/mysql-test/suite/jp/t/jp_locate_ucs2.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --source include/have_ucs2.inc --disable_warnings diff --git a/mysql-test/suite/jp/t/jp_locate_ujis.test b/mysql-test/suite/jp/t/jp_locate_ujis.test index 5375fad75db..872555a4532 100644 --- a/mysql-test/suite/jp/t/jp_locate_ujis.test +++ b/mysql-test/suite/jp/t/jp_locate_ujis.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --source include/have_ujis.inc --disable_warnings diff --git a/mysql-test/suite/jp/t/jp_locate_utf8.test b/mysql-test/suite/jp/t/jp_locate_utf8.test index cbf6714e322..85d2e69fd60 100644 --- a/mysql-test/suite/jp/t/jp_locate_utf8.test +++ b/mysql-test/suite/jp/t/jp_locate_utf8.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --disable_warnings drop table if exists `锛达紤`; drop table if exists `锛达紥`; diff --git a/mysql-test/suite/jp/t/jp_lpad_sjis.test b/mysql-test/suite/jp/t/jp_lpad_sjis.test index 7038112cbc8..4b18402473d 100644 --- a/mysql-test/suite/jp/t/jp_lpad_sjis.test +++ b/mysql-test/suite/jp/t/jp_lpad_sjis.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --character_set sjis --disable_warnings drop table if exists `俿侾`; diff --git a/mysql-test/suite/jp/t/jp_lpad_ucs2.test b/mysql-test/suite/jp/t/jp_lpad_ucs2.test index e3bead0855a..95dd088abce 100644 --- a/mysql-test/suite/jp/t/jp_lpad_ucs2.test +++ b/mysql-test/suite/jp/t/jp_lpad_ucs2.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --source include/have_ucs2.inc --disable_warnings diff --git a/mysql-test/suite/jp/t/jp_lpad_ujis.test b/mysql-test/suite/jp/t/jp_lpad_ujis.test index eea4877ec3a..c1149a67207 100644 --- a/mysql-test/suite/jp/t/jp_lpad_ujis.test +++ b/mysql-test/suite/jp/t/jp_lpad_ujis.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --source include/have_ujis.inc --disable_warnings diff --git a/mysql-test/suite/jp/t/jp_lpad_utf8.test b/mysql-test/suite/jp/t/jp_lpad_utf8.test index 599bf5eba28..42aa2fd860b 100644 --- a/mysql-test/suite/jp/t/jp_lpad_utf8.test +++ b/mysql-test/suite/jp/t/jp_lpad_utf8.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --disable_warnings drop table if exists `锛达紤`; drop table if exists `锛达紥`; diff --git a/mysql-test/suite/jp/t/jp_ltrim_sjis.test b/mysql-test/suite/jp/t/jp_ltrim_sjis.test index 864238df07c..7b5e20ec9a4 100644 --- a/mysql-test/suite/jp/t/jp_ltrim_sjis.test +++ b/mysql-test/suite/jp/t/jp_ltrim_sjis.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --character_set sjis --disable_warnings drop table if exists `俿侾`; diff --git a/mysql-test/suite/jp/t/jp_ltrim_ucs2.test b/mysql-test/suite/jp/t/jp_ltrim_ucs2.test index 0ae647f5222..25a6eaabc60 100644 --- a/mysql-test/suite/jp/t/jp_ltrim_ucs2.test +++ b/mysql-test/suite/jp/t/jp_ltrim_ucs2.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --source include/have_ucs2.inc --disable_warnings diff --git a/mysql-test/suite/jp/t/jp_ltrim_ujis.test b/mysql-test/suite/jp/t/jp_ltrim_ujis.test index 64363aa330b..fbba90a38b5 100644 --- a/mysql-test/suite/jp/t/jp_ltrim_ujis.test +++ b/mysql-test/suite/jp/t/jp_ltrim_ujis.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --source include/have_ujis.inc --disable_warnings diff --git a/mysql-test/suite/jp/t/jp_ltrim_utf8.test b/mysql-test/suite/jp/t/jp_ltrim_utf8.test index 846ce11163b..b33d22e459d 100644 --- a/mysql-test/suite/jp/t/jp_ltrim_utf8.test +++ b/mysql-test/suite/jp/t/jp_ltrim_utf8.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --disable_warnings drop table if exists `锛达紤`; drop table if exists `锛达紥`; diff --git a/mysql-test/suite/jp/t/jp_ps_sjis.test b/mysql-test/suite/jp/t/jp_ps_sjis.test index cc93dca2a79..2e09c51cf7a 100644 --- a/mysql-test/suite/jp/t/jp_ps_sjis.test +++ b/mysql-test/suite/jp/t/jp_ps_sjis.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --character_set sjis --disable_warnings DROP TABLE IF EXISTS t1; diff --git a/mysql-test/suite/jp/t/jp_ps_ujis.test b/mysql-test/suite/jp/t/jp_ps_ujis.test index 7d61c12e496..ab64fcf5216 100644 --- a/mysql-test/suite/jp/t/jp_ps_ujis.test +++ b/mysql-test/suite/jp/t/jp_ps_ujis.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --source include/have_ujis.inc --disable_warnings diff --git a/mysql-test/suite/jp/t/jp_replace_sjis.test b/mysql-test/suite/jp/t/jp_replace_sjis.test index 811d3350a34..91996ba83e9 100644 --- a/mysql-test/suite/jp/t/jp_replace_sjis.test +++ b/mysql-test/suite/jp/t/jp_replace_sjis.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --character_set sjis --disable_warnings drop table if exists `俿侾`; diff --git a/mysql-test/suite/jp/t/jp_replace_ucs2.test b/mysql-test/suite/jp/t/jp_replace_ucs2.test index 7739a30cd9c..3043115ef62 100644 --- a/mysql-test/suite/jp/t/jp_replace_ucs2.test +++ b/mysql-test/suite/jp/t/jp_replace_ucs2.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --source include/have_ucs2.inc --disable_warnings diff --git a/mysql-test/suite/jp/t/jp_replace_ujis.test b/mysql-test/suite/jp/t/jp_replace_ujis.test index 3d8724e63d5..1ba29426010 100644 --- a/mysql-test/suite/jp/t/jp_replace_ujis.test +++ b/mysql-test/suite/jp/t/jp_replace_ujis.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --source include/have_ujis.inc --disable_warnings diff --git a/mysql-test/suite/jp/t/jp_replace_utf8.test b/mysql-test/suite/jp/t/jp_replace_utf8.test index 1d89a43648b..81b892a5df7 100644 --- a/mysql-test/suite/jp/t/jp_replace_utf8.test +++ b/mysql-test/suite/jp/t/jp_replace_utf8.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --disable_warnings drop table if exists `锛达紤`; drop table if exists `锛达紥`; diff --git a/mysql-test/suite/jp/t/jp_reverse_sjis.test b/mysql-test/suite/jp/t/jp_reverse_sjis.test index c1e2b2a17ca..5d9014dc3a6 100644 --- a/mysql-test/suite/jp/t/jp_reverse_sjis.test +++ b/mysql-test/suite/jp/t/jp_reverse_sjis.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --character_set sjis --disable_warnings drop table if exists `俿侾`; diff --git a/mysql-test/suite/jp/t/jp_reverse_ucs2.test b/mysql-test/suite/jp/t/jp_reverse_ucs2.test index d91ec7f70e8..95afeeda570 100644 --- a/mysql-test/suite/jp/t/jp_reverse_ucs2.test +++ b/mysql-test/suite/jp/t/jp_reverse_ucs2.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --source include/have_ucs2.inc --disable_warnings diff --git a/mysql-test/suite/jp/t/jp_reverse_ujis.test b/mysql-test/suite/jp/t/jp_reverse_ujis.test index d37d363f59a..0d66201c367 100644 --- a/mysql-test/suite/jp/t/jp_reverse_ujis.test +++ b/mysql-test/suite/jp/t/jp_reverse_ujis.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --source include/have_ujis.inc --disable_warnings diff --git a/mysql-test/suite/jp/t/jp_reverse_utf8.test b/mysql-test/suite/jp/t/jp_reverse_utf8.test index 4e53d4be049..ee323b64ada 100644 --- a/mysql-test/suite/jp/t/jp_reverse_utf8.test +++ b/mysql-test/suite/jp/t/jp_reverse_utf8.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --disable_warnings drop table if exists `锛达紤`; drop table if exists `锛达紥`; diff --git a/mysql-test/suite/jp/t/jp_right_sjis.test b/mysql-test/suite/jp/t/jp_right_sjis.test index f481ec532ec..edf3795c510 100644 --- a/mysql-test/suite/jp/t/jp_right_sjis.test +++ b/mysql-test/suite/jp/t/jp_right_sjis.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --character_set sjis --disable_warnings drop table if exists `俿侾`; diff --git a/mysql-test/suite/jp/t/jp_right_ucs2.test b/mysql-test/suite/jp/t/jp_right_ucs2.test index 23ca2fa4fae..d3132b3e11f 100644 --- a/mysql-test/suite/jp/t/jp_right_ucs2.test +++ b/mysql-test/suite/jp/t/jp_right_ucs2.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --source include/have_ucs2.inc --disable_warnings diff --git a/mysql-test/suite/jp/t/jp_right_ujis.test b/mysql-test/suite/jp/t/jp_right_ujis.test index b5284489c7e..92cd7ed83dc 100644 --- a/mysql-test/suite/jp/t/jp_right_ujis.test +++ b/mysql-test/suite/jp/t/jp_right_ujis.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --source include/have_ujis.inc --disable_warnings diff --git a/mysql-test/suite/jp/t/jp_right_utf8.test b/mysql-test/suite/jp/t/jp_right_utf8.test index 863755c1dcf..6d884e55771 100644 --- a/mysql-test/suite/jp/t/jp_right_utf8.test +++ b/mysql-test/suite/jp/t/jp_right_utf8.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --disable_warnings drop table if exists `锛达紤`; drop table if exists `锛达紥`; diff --git a/mysql-test/suite/jp/t/jp_rpad_sjis.test b/mysql-test/suite/jp/t/jp_rpad_sjis.test index cc008631548..1bf752020bb 100644 --- a/mysql-test/suite/jp/t/jp_rpad_sjis.test +++ b/mysql-test/suite/jp/t/jp_rpad_sjis.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --character_set sjis --disable_warnings drop table if exists `俿侾`; diff --git a/mysql-test/suite/jp/t/jp_rpad_ucs2.test b/mysql-test/suite/jp/t/jp_rpad_ucs2.test index ca5059497d3..f3876dafe2f 100644 --- a/mysql-test/suite/jp/t/jp_rpad_ucs2.test +++ b/mysql-test/suite/jp/t/jp_rpad_ucs2.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --source include/have_ucs2.inc --disable_warnings diff --git a/mysql-test/suite/jp/t/jp_rpad_ujis.test b/mysql-test/suite/jp/t/jp_rpad_ujis.test index d7725b80af7..6ace7442b8d 100644 --- a/mysql-test/suite/jp/t/jp_rpad_ujis.test +++ b/mysql-test/suite/jp/t/jp_rpad_ujis.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --source include/have_ujis.inc --disable_warnings diff --git a/mysql-test/suite/jp/t/jp_rpad_utf8.test b/mysql-test/suite/jp/t/jp_rpad_utf8.test index b5a335bc6ce..6c075e20cb9 100644 --- a/mysql-test/suite/jp/t/jp_rpad_utf8.test +++ b/mysql-test/suite/jp/t/jp_rpad_utf8.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --disable_warnings drop table if exists `锛达紤`; drop table if exists `锛达紥`; diff --git a/mysql-test/suite/jp/t/jp_rtrim_sjis.test b/mysql-test/suite/jp/t/jp_rtrim_sjis.test index c80cf9410f9..1a9511698ce 100644 --- a/mysql-test/suite/jp/t/jp_rtrim_sjis.test +++ b/mysql-test/suite/jp/t/jp_rtrim_sjis.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --character_set sjis --disable_warnings drop table if exists `俿侾`; diff --git a/mysql-test/suite/jp/t/jp_rtrim_ucs2.test b/mysql-test/suite/jp/t/jp_rtrim_ucs2.test index 0fac38d12d1..2132eaa5cbe 100644 --- a/mysql-test/suite/jp/t/jp_rtrim_ucs2.test +++ b/mysql-test/suite/jp/t/jp_rtrim_ucs2.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --source include/have_ucs2.inc --disable_warnings diff --git a/mysql-test/suite/jp/t/jp_rtrim_ujis.test b/mysql-test/suite/jp/t/jp_rtrim_ujis.test index 46cda84dd55..07b42b96dfd 100644 --- a/mysql-test/suite/jp/t/jp_rtrim_ujis.test +++ b/mysql-test/suite/jp/t/jp_rtrim_ujis.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --source include/have_ujis.inc --disable_warnings diff --git a/mysql-test/suite/jp/t/jp_rtrim_utf8.test b/mysql-test/suite/jp/t/jp_rtrim_utf8.test index 4880a42db3e..48f863d891c 100644 --- a/mysql-test/suite/jp/t/jp_rtrim_utf8.test +++ b/mysql-test/suite/jp/t/jp_rtrim_utf8.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --disable_warnings drop table if exists `锛达紤`; drop table if exists `锛达紥`; diff --git a/mysql-test/suite/jp/t/jp_select_sjis.test b/mysql-test/suite/jp/t/jp_select_sjis.test index d84ed7a4b2c..fc80ce01471 100644 --- a/mysql-test/suite/jp/t/jp_select_sjis.test +++ b/mysql-test/suite/jp/t/jp_select_sjis.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --character_set sjis --disable_warnings drop table if exists `俿侾`; diff --git a/mysql-test/suite/jp/t/jp_select_ucs2.test b/mysql-test/suite/jp/t/jp_select_ucs2.test index 2e4602e7ea4..6cebdb65db1 100644 --- a/mysql-test/suite/jp/t/jp_select_ucs2.test +++ b/mysql-test/suite/jp/t/jp_select_ucs2.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --source include/have_ucs2.inc --disable_warnings diff --git a/mysql-test/suite/jp/t/jp_select_ujis.test b/mysql-test/suite/jp/t/jp_select_ujis.test index 4ad9e581a92..0e4d1ffc771 100644 --- a/mysql-test/suite/jp/t/jp_select_ujis.test +++ b/mysql-test/suite/jp/t/jp_select_ujis.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --source include/have_ujis.inc --disable_warnings diff --git a/mysql-test/suite/jp/t/jp_select_utf8.test b/mysql-test/suite/jp/t/jp_select_utf8.test index e614b9ccfb0..88fd6677f7c 100644 --- a/mysql-test/suite/jp/t/jp_select_utf8.test +++ b/mysql-test/suite/jp/t/jp_select_utf8.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --disable_warnings drop table if exists `锛达紤`; drop table if exists `锛达紥`; diff --git a/mysql-test/suite/jp/t/jp_subquery_sjis.test b/mysql-test/suite/jp/t/jp_subquery_sjis.test index 5292c7a2519..b6aa3e52f51 100644 --- a/mysql-test/suite/jp/t/jp_subquery_sjis.test +++ b/mysql-test/suite/jp/t/jp_subquery_sjis.test @@ -1,3 +1,4 @@ +-- source include/have_innodb.inc --character_set sjis --disable_warnings drop table if exists `俿侾`; diff --git a/mysql-test/suite/jp/t/jp_subquery_ucs2.test b/mysql-test/suite/jp/t/jp_subquery_ucs2.test index 311433438f4..d2c1fd29358 100644 --- a/mysql-test/suite/jp/t/jp_subquery_ucs2.test +++ b/mysql-test/suite/jp/t/jp_subquery_ucs2.test @@ -1,3 +1,4 @@ +-- source include/have_innodb.inc --source include/have_ucs2.inc --disable_warnings diff --git a/mysql-test/suite/jp/t/jp_subquery_ujis.test b/mysql-test/suite/jp/t/jp_subquery_ujis.test index 67c9f00fd85..2fd0427481c 100644 --- a/mysql-test/suite/jp/t/jp_subquery_ujis.test +++ b/mysql-test/suite/jp/t/jp_subquery_ujis.test @@ -1,3 +1,4 @@ +-- source include/have_innodb.inc --source include/have_ujis.inc --disable_warnings diff --git a/mysql-test/suite/jp/t/jp_subquery_utf8.test b/mysql-test/suite/jp/t/jp_subquery_utf8.test index 97c2df8ce30..460f1c1a903 100644 --- a/mysql-test/suite/jp/t/jp_subquery_utf8.test +++ b/mysql-test/suite/jp/t/jp_subquery_utf8.test @@ -1,3 +1,4 @@ +-- source include/have_innodb.inc --disable_warnings drop table if exists `锛达紤`; drop table if exists `锛达紥`; diff --git a/mysql-test/suite/jp/t/jp_substring_sjis.test b/mysql-test/suite/jp/t/jp_substring_sjis.test index ac929114880..a6c9496a873 100644 --- a/mysql-test/suite/jp/t/jp_substring_sjis.test +++ b/mysql-test/suite/jp/t/jp_substring_sjis.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --character_set sjis --disable_warnings drop table if exists `俿侾`; diff --git a/mysql-test/suite/jp/t/jp_substring_ucs2.test b/mysql-test/suite/jp/t/jp_substring_ucs2.test index f3cd5550072..71c0f903aa8 100644 --- a/mysql-test/suite/jp/t/jp_substring_ucs2.test +++ b/mysql-test/suite/jp/t/jp_substring_ucs2.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --source include/have_ucs2.inc --disable_warnings diff --git a/mysql-test/suite/jp/t/jp_substring_ujis.test b/mysql-test/suite/jp/t/jp_substring_ujis.test index c201c7148da..c93ab761352 100644 --- a/mysql-test/suite/jp/t/jp_substring_ujis.test +++ b/mysql-test/suite/jp/t/jp_substring_ujis.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --source include/have_ujis.inc --disable_warnings diff --git a/mysql-test/suite/jp/t/jp_substring_utf8.test b/mysql-test/suite/jp/t/jp_substring_utf8.test index 9f88115c899..3bd1bbbb491 100644 --- a/mysql-test/suite/jp/t/jp_substring_utf8.test +++ b/mysql-test/suite/jp/t/jp_substring_utf8.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --disable_warnings drop table if exists `锛达紤`; drop table if exists `锛达紥`; diff --git a/mysql-test/suite/jp/t/jp_trim_sjis.test b/mysql-test/suite/jp/t/jp_trim_sjis.test index 0f6821605ed..04dc832d49f 100644 --- a/mysql-test/suite/jp/t/jp_trim_sjis.test +++ b/mysql-test/suite/jp/t/jp_trim_sjis.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --character_set sjis --disable_warnings drop table if exists `俿侾`; diff --git a/mysql-test/suite/jp/t/jp_trim_ucs2.test b/mysql-test/suite/jp/t/jp_trim_ucs2.test index 1d8a12650e0..7c82c249dcc 100644 --- a/mysql-test/suite/jp/t/jp_trim_ucs2.test +++ b/mysql-test/suite/jp/t/jp_trim_ucs2.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --source include/have_ucs2.inc --disable_warnings diff --git a/mysql-test/suite/jp/t/jp_trim_ujis.test b/mysql-test/suite/jp/t/jp_trim_ujis.test index de401217fcf..bcd9942f0ae 100644 --- a/mysql-test/suite/jp/t/jp_trim_ujis.test +++ b/mysql-test/suite/jp/t/jp_trim_ujis.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --source include/have_ujis.inc --disable_warnings diff --git a/mysql-test/suite/jp/t/jp_trim_utf8.test b/mysql-test/suite/jp/t/jp_trim_utf8.test index 0777de15c36..f6f487254bc 100644 --- a/mysql-test/suite/jp/t/jp_trim_utf8.test +++ b/mysql-test/suite/jp/t/jp_trim_utf8.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --disable_warnings drop table if exists `锛达紤`; drop table if exists `锛达紥`; diff --git a/mysql-test/suite/jp/t/jp_union_ujis.test b/mysql-test/suite/jp/t/jp_union_ujis.test index e36d18c85c0..c1252b9f5a2 100644 --- a/mysql-test/suite/jp/t/jp_union_ujis.test +++ b/mysql-test/suite/jp/t/jp_union_ujis.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --source include/have_ujis.inc --disable_warnings diff --git a/mysql-test/suite/jp/t/jp_update_sjis.test b/mysql-test/suite/jp/t/jp_update_sjis.test index 0dc7372ae92..4b3733cff76 100644 --- a/mysql-test/suite/jp/t/jp_update_sjis.test +++ b/mysql-test/suite/jp/t/jp_update_sjis.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --character_set sjis --disable_warnings drop table if exists `俿侾`; diff --git a/mysql-test/suite/jp/t/jp_update_ucs2.test b/mysql-test/suite/jp/t/jp_update_ucs2.test index 7a3c1233210..6ad7db9c5a0 100644 --- a/mysql-test/suite/jp/t/jp_update_ucs2.test +++ b/mysql-test/suite/jp/t/jp_update_ucs2.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --source include/have_ucs2.inc --disable_warnings diff --git a/mysql-test/suite/jp/t/jp_update_ujis.test b/mysql-test/suite/jp/t/jp_update_ujis.test index 852e45b9eeb..14ca6580f04 100644 --- a/mysql-test/suite/jp/t/jp_update_ujis.test +++ b/mysql-test/suite/jp/t/jp_update_ujis.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --source include/have_ujis.inc --disable_warnings diff --git a/mysql-test/suite/jp/t/jp_update_utf8.test b/mysql-test/suite/jp/t/jp_update_utf8.test index b4b3d18ecab..135f6e6981c 100644 --- a/mysql-test/suite/jp/t/jp_update_utf8.test +++ b/mysql-test/suite/jp/t/jp_update_utf8.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --disable_warnings drop table if exists `锛达紤`; drop table if exists `锛达紥`; diff --git a/mysql-test/suite/jp/t/jp_where_sjis.test b/mysql-test/suite/jp/t/jp_where_sjis.test index 452d137f643..890a4c28f3c 100644 --- a/mysql-test/suite/jp/t/jp_where_sjis.test +++ b/mysql-test/suite/jp/t/jp_where_sjis.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --character_set sjis --disable_warnings drop table if exists `俿侾`; diff --git a/mysql-test/suite/jp/t/jp_where_ucs2.test b/mysql-test/suite/jp/t/jp_where_ucs2.test index 3b82eacd615..7d90faaaa89 100644 --- a/mysql-test/suite/jp/t/jp_where_ucs2.test +++ b/mysql-test/suite/jp/t/jp_where_ucs2.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --source include/have_ucs2.inc --disable_warnings diff --git a/mysql-test/suite/jp/t/jp_where_ujis.test b/mysql-test/suite/jp/t/jp_where_ujis.test index e96404fbb17..2f0924e8c8e 100644 --- a/mysql-test/suite/jp/t/jp_where_ujis.test +++ b/mysql-test/suite/jp/t/jp_where_ujis.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --source include/have_ujis.inc --disable_warnings diff --git a/mysql-test/suite/jp/t/jp_where_utf8.test b/mysql-test/suite/jp/t/jp_where_utf8.test index 7280bc33f21..231553e8819 100644 --- a/mysql-test/suite/jp/t/jp_where_utf8.test +++ b/mysql-test/suite/jp/t/jp_where_utf8.test @@ -1,3 +1,5 @@ +-- source include/have_innodb.inc +-- source include/have_bdb.inc --disable_warnings drop table if exists `锛达紤`; drop table if exists `锛达紥`; |