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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 ` 齔齣齟齠齡齦齧齬齪齷齲齶龕龜龠・・・・・ 齔齣齟齠齡齦齧齬齪齷齲齶龕龜龠・・・・・ 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 ` 齔齣齟齠齡齦齧齬齪齷齲齶龕龜龠・・・・・ 齔齣齟齠齡齦齧齬齪齷齲齶龕龜龠・・・・・ 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 ` 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 ` 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 ` 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 ` 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 ` 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 ` 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 ` 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 ` 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 ` 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 ` 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 ` 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 ` 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 ` 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 ` 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 ` 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 ` 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 ` ｶ ｱ ｻ ｱ 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 ` か あ さ あ 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 ` 十 ソ 表 ソ 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 ` ｶ ｱ ｻ ｱ 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 ` か あ さ あ 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 ` 十 ソ 表 ソ 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 ` ｶ ｱ ｻ ｱ 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 ` か あ さ あ 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 ` 十 ソ 表 ソ 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 ` ｶ ｱ ｻ ｱ 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 ` か あ さ あ 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 ` 十 ソ 表 ソ 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 ` 叱 竺 悉 竺 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 ` ､ｫ ､｢ ､ｵ ､｢ 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 ` 常ﾝ 常ﾜ 常ﾞ 常ﾜ 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 ` 叱 竺 悉 竺 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 ` ､ｫ ､｢ ､ｵ ､｢ 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 ` 常ﾝ 常ﾜ 常ﾞ 常ﾜ 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 ` 叱 竺 悉 竺 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 ` ､ｫ ､｢ ､ｵ ､｢ 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 ` 常ﾝ 常ﾜ 常ﾞ 常ﾜ 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 ` 叱 竺 悉 竺 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 ` ､ｫ ､｢ ､ｵ ､｢ 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 ` 常ﾝ 常ﾜ 常ﾞ 常ﾜ 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 ` 叱 竺 悉 竺 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 ` ､ｫ ､｢ ､ｵ ､｢ 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 ` 常ﾝ 常ﾜ 常ﾞ 常ﾜ 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 ` 叱 竺 悉 竺 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 ` ､ｫ ､｢ ､ｵ ､｢ 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 ` 常ﾝ 常ﾜ 常ﾞ 常ﾜ 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 ` 叱 竺 悉 竺 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 ` ､ｫ ､｢ ､ｵ ､｢ 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 ` 常ﾝ 常ﾜ 常ﾞ 常ﾜ 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 ` 叱 竺 悉 竺 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 ` ､ｫ ､｢ ､ｵ ､｢ 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 ` 常ﾝ 常ﾜ 常ﾞ 常ﾜ 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 `ｼｴｼ疎` 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 (`ｼｴｼ疎`.`ｼ｣ｼ疏 = `ｼｴｼ礎`.`ｼ｣ｼ疏); ｼ｣ｼ ｼ｣ｼ ｽｱ ｽｱ @@ -112,31 +112,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 (`ｼｴｼ誕`.`ｼ｣ｼ疏 = `ｼｴｼ鍛`.`ｼ｣ｼ疏); ｼ｣ｼ ｼ｣ｼ 縺 縺 @@ -153,31 +153,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 (`ｼｴｼ殿`.`ｼ｣ｼ疏 = `ｼｴｼ澱`.`ｼ｣ｼ疏); ｼ｣ｼ ｼ｣ｼ 鮴 鮴 @@ -194,31 +194,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 (`ｼｴｼ蚤`.`ｼ｣ｼ疏 = `ｼｴｼ巴`.`ｼ｣ｼ疏); ｼ｣ｼ ｼ｣ｼ ｽｱ ｽｱ @@ -235,31 +235,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 (`ｼｴｼ病`.`ｼ｣ｼ疏 = `ｼｴｼ秒`.`ｼ｣ｼ疏); ｼ｣ｼ ｼ｣ｼ 縺 縺 @@ -276,31 +276,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 (`ｼｴｼ紡`.`ｼ｣ｼ疏 = `ｼｴｼ肪`.`ｼ｣ｼ疏); ｼ｣ｼ ｼ｣ｼ 鮴 鮴 @@ -317,31 +317,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 (`ｼｴｼ預`.`ｼ｣ｼ疏 = `ｼｴｼ傭`.`ｼ｣ｼ疏); ｼ｣ｼ ｼ｣ｼ ｽｱ ｽｱ @@ -358,31 +358,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 (`ｼｴｼ和`.`ｼ｣ｼ疏 = `ｼｴｼ話`.`ｼ｣ｼ疏); ｼ｣ｼ ｼ｣ｼ 縺 縺 @@ -399,31 +399,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 (`ｼｴｼ兮`.`ｼ｣ｼ疏 = `ｼｴｼ冀`.`ｼ｣ｼ疏); ｼ｣ｼ ｼ｣ｼ 鮴 鮴 @@ -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 `ｼｴｼ蛋;