12 files changed, 324 insertions, 324 deletions

diff --git a/mysql-test/suite/jp/r/jp_alter_sjis.result b/mysql-test/suite/jp/r/jp_alter_sjis.result
index 20b71952197..5574f5432f1 100644
--- a/mysql-test/suite/jp/r/jp_alter_sjis.result
+++ b/mysql-test/suite/jp/r/jp_alter_sjis.result
@@ -44,7 +44,7 @@ Table	Create Table
   PRIMARY KEY (`祁�`),
   UNIQUE KEY `幻�` (`幻�`),
   KEY `橋�` (`橋`)
-) ENGINE=InnoDB DEFAULT CHARSET=sjis
+) ENGINE=InnoDB DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 ALTER TABLE `臼�` DROP INDEX `橋�`;
 ALTER TABLE `臼�` DROP PRIMARY KEY;
 ALTER TABLE `臼�` DROP INDEX `幻�`;
@@ -63,7 +63,7 @@ SHOW CREATE TABLE `臼�`;
 Table	Create Table
 臼�	CREATE TABLE `臼�` (
   `祁�` char(6) NOT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=sjis
+) ENGINE=InnoDB DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 ALTER TABLE `������` ADD `������` char(1) FIRST;
 ALTER TABLE `������` ADD `������` char(1) AFTER `������`;
 ALTER TABLE `������` ADD `������` char(1);
@@ -93,7 +93,7 @@ Table	Create Table
   PRIMARY KEY (`������`),
   UNIQUE KEY `������` (`������`),
   KEY `������` (`����`)
-) ENGINE=InnoDB DEFAULT CHARSET=sjis
+) ENGINE=InnoDB DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 ALTER TABLE `������` DROP INDEX `������`;
 ALTER TABLE `������` DROP PRIMARY KEY;
 ALTER TABLE `������` DROP INDEX `������`;
@@ -112,7 +112,7 @@ SHOW CREATE TABLE `������`;
 Table	Create Table
 ������	CREATE TABLE `������` (
   `������` char(6) NOT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=sjis
+) ENGINE=InnoDB DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 ALTER TABLE `�\�\�\` ADD `�\�\�\` char(1) FIRST;
 ALTER TABLE `�\�\�\` ADD `�\�\�\` char(1) AFTER `�\�\�\`;
 ALTER TABLE `�\�\�\` ADD `�\�\�\` char(1);
@@ -142,7 +142,7 @@ Table	Create Table
   PRIMARY KEY (`�\�\�\`),
   UNIQUE KEY `�\�\�\` (`�\�\�\`),
   KEY `�\�\�\` (`�\�\`)
-) ENGINE=InnoDB DEFAULT CHARSET=sjis
+) ENGINE=InnoDB DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 ALTER TABLE `�\�\�\` DROP INDEX `�\�\�\`;
 ALTER TABLE `�\�\�\` DROP PRIMARY KEY;
 ALTER TABLE `�\�\�\` DROP INDEX `�\�\�\`;
@@ -161,7 +161,7 @@ SHOW CREATE TABLE `�\�\�\`;
 Table	Create Table
 �\�\�\	CREATE TABLE `�\�\�\` (
   `�\�\�\` char(6) NOT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=sjis
+) ENGINE=InnoDB DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 DROP TABLE `臼�`;
 DROP TABLE `臆�`;
 DROP TABLE `������`;
@@ -206,7 +206,7 @@ Table	Create Table
   PRIMARY KEY (`祁�`),
   UNIQUE KEY `幻�` (`幻�`),
   KEY `橋�` (`橋`)
-) ENGINE=MyISAM DEFAULT CHARSET=sjis
+) ENGINE=MyISAM DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 ALTER TABLE `臼�` DROP INDEX `橋�`;
 ALTER TABLE `臼�` DROP PRIMARY KEY;
 ALTER TABLE `臼�` DROP INDEX `幻�`;
@@ -225,7 +225,7 @@ SHOW CREATE TABLE `臼�`;
 Table	Create Table
 臼�	CREATE TABLE `臼�` (
   `祁�` char(6) NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=sjis
+) ENGINE=MyISAM DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 ALTER TABLE `������` ADD `������` char(1) FIRST;
 ALTER TABLE `������` ADD `������` char(1) AFTER `������`;
 ALTER TABLE `������` ADD `������` char(1);
@@ -255,7 +255,7 @@ Table	Create Table
   PRIMARY KEY (`������`),
   UNIQUE KEY `������` (`������`),
   KEY `������` (`����`)
-) ENGINE=MyISAM DEFAULT CHARSET=sjis
+) ENGINE=MyISAM DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 ALTER TABLE `������` DROP INDEX `������`;
 ALTER TABLE `������` DROP PRIMARY KEY;
 ALTER TABLE `������` DROP INDEX `������`;
@@ -274,7 +274,7 @@ SHOW CREATE TABLE `������`;
 Table	Create Table
 ������	CREATE TABLE `������` (
   `������` char(6) NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=sjis
+) ENGINE=MyISAM DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 ALTER TABLE `�\�\�\` ADD `�\�\�\` char(1) FIRST;
 ALTER TABLE `�\�\�\` ADD `�\�\�\` char(1) AFTER `�\�\�\`;
 ALTER TABLE `�\�\�\` ADD `�\�\�\` char(1);
@@ -304,7 +304,7 @@ Table	Create Table
   PRIMARY KEY (`�\�\�\`),
   UNIQUE KEY `�\�\�\` (`�\�\�\`),
   KEY `�\�\�\` (`�\�\`)
-) ENGINE=MyISAM DEFAULT CHARSET=sjis
+) ENGINE=MyISAM DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 ALTER TABLE `�\�\�\` DROP INDEX `�\�\�\`;
 ALTER TABLE `�\�\�\` DROP PRIMARY KEY;
 ALTER TABLE `�\�\�\` DROP INDEX `�\�\�\`;
@@ -323,7 +323,7 @@ SHOW CREATE TABLE `�\�\�\`;
 Table	Create Table
 �\�\�\	CREATE TABLE `�\�\�\` (
   `�\�\�\` char(6) NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=sjis
+) ENGINE=MyISAM DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 DROP TABLE `臼�`;
 DROP TABLE `臆�`;
 DROP TABLE `������`;
@@ -368,7 +368,7 @@ Table	Create Table
   PRIMARY KEY (`祁�`),
   UNIQUE KEY `幻�` (`幻�`),
   KEY `橋�` (`橋`)
-) ENGINE=MEMORY DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 ALTER TABLE `臼�` DROP INDEX `橋�`;
 ALTER TABLE `臼�` DROP PRIMARY KEY;
 ALTER TABLE `臼�` DROP INDEX `幻�`;
@@ -387,7 +387,7 @@ SHOW CREATE TABLE `臼�`;
 Table	Create Table
 臼�	CREATE TABLE `臼�` (
   `祁�` char(6) NOT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 ALTER TABLE `������` ADD `������` char(1) FIRST;
 ALTER TABLE `������` ADD `������` char(1) AFTER `������`;
 ALTER TABLE `������` ADD `������` char(1);
@@ -417,7 +417,7 @@ Table	Create Table
   PRIMARY KEY (`������`),
   UNIQUE KEY `������` (`������`),
   KEY `������` (`����`)
-) ENGINE=MEMORY DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 ALTER TABLE `������` DROP INDEX `������`;
 ALTER TABLE `������` DROP PRIMARY KEY;
 ALTER TABLE `������` DROP INDEX `������`;
@@ -436,7 +436,7 @@ SHOW CREATE TABLE `������`;
 Table	Create Table
 ������	CREATE TABLE `������` (
   `������` char(6) NOT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 ALTER TABLE `�\�\�\` ADD `�\�\�\` char(1) FIRST;
 ALTER TABLE `�\�\�\` ADD `�\�\�\` char(1) AFTER `�\�\�\`;
 ALTER TABLE `�\�\�\` ADD `�\�\�\` char(1);
@@ -466,7 +466,7 @@ Table	Create Table
   PRIMARY KEY (`�\�\�\`),
   UNIQUE KEY `�\�\�\` (`�\�\�\`),
   KEY `�\�\�\` (`�\�\`)
-) ENGINE=MEMORY DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 ALTER TABLE `�\�\�\` DROP INDEX `�\�\�\`;
 ALTER TABLE `�\�\�\` DROP PRIMARY KEY;
 ALTER TABLE `�\�\�\` DROP INDEX `�\�\�\`;
@@ -485,7 +485,7 @@ SHOW CREATE TABLE `�\�\�\`;
 Table	Create Table
 �\�\�\	CREATE TABLE `�\�\�\` (
   `�\�\�\` char(6) NOT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 DROP TABLE `臼�`;
 DROP TABLE `臆�`;
 DROP TABLE `������`;
diff --git a/mysql-test/suite/jp/r/jp_alter_ucs2.result b/mysql-test/suite/jp/r/jp_alter_ucs2.result
index 204913250cc..336bd6fec94 100644
--- a/mysql-test/suite/jp/r/jp_alter_ucs2.result
+++ b/mysql-test/suite/jp/r/jp_alter_ucs2.result
@@ -45,7 +45,7 @@ Table	Create Table
   PRIMARY KEY (`ｷｷｷ`),
   UNIQUE KEY `ｸｸｸ` (`ｸｸｸ`),
   KEY `ｶｶｶ` (`ｶｶ`)
-) ENGINE=InnoDB DEFAULT CHARSET=ucs2
+) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 ALTER TABLE `ｱｱｱ` DROP INDEX `ｶｶｶ`;
 ALTER TABLE `ｱｱｱ` DROP PRIMARY KEY;
 ALTER TABLE `ｱｱｱ` DROP INDEX `ｸｸｸ`;
@@ -64,7 +64,7 @@ SHOW CREATE TABLE `ｱｱｱ`;
 Table	Create Table
 ｱｱｱ	CREATE TABLE `ｱｱｱ` (
   `ｷｷｷ` char(6) NOT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=ucs2
+) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 ALTER TABLE `あああ` ADD `かかか` char(1) FIRST;
 ALTER TABLE `あああ` ADD `くくく` char(1) AFTER `ききき`;
 ALTER TABLE `あああ` ADD `けけけ` char(1);
@@ -94,7 +94,7 @@ Table	Create Table
   PRIMARY KEY (`ききき`),
   UNIQUE KEY `くくく` (`くくく`),
   KEY `かかか` (`かか`)
-) ENGINE=InnoDB DEFAULT CHARSET=ucs2
+) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 ALTER TABLE `あああ` DROP INDEX `かかか`;
 ALTER TABLE `あああ` DROP PRIMARY KEY;
 ALTER TABLE `あああ` DROP INDEX `くくく`;
@@ -113,7 +113,7 @@ SHOW CREATE TABLE `あああ`;
 Table	Create Table
 あああ	CREATE TABLE `あああ` (
   `ききき` char(6) NOT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=ucs2
+) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 ALTER TABLE `龖龖龖` ADD `丄丄丄` char(1) FIRST;
 ALTER TABLE `龖龖龖` ADD `丅丅丅` char(1) AFTER `丂丂丂`;
 ALTER TABLE `龖龖龖` ADD `乚乚乚` char(1);
@@ -143,7 +143,7 @@ Table	Create Table
   PRIMARY KEY (`丂丂丂`),
   UNIQUE KEY `丅丅丅` (`丅丅丅`),
   KEY `丄丄丄` (`丄丄`)
-) ENGINE=InnoDB DEFAULT CHARSET=ucs2
+) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 ALTER TABLE `龖龖龖` DROP INDEX `丄丄丄`;
 ALTER TABLE `龖龖龖` DROP PRIMARY KEY;
 ALTER TABLE `龖龖龖` DROP INDEX `丅丅丅`;
@@ -162,7 +162,7 @@ SHOW CREATE TABLE `龖龖龖`;
 Table	Create Table
 龖龖龖	CREATE TABLE `龖龖龖` (
   `丂丂丂` char(6) NOT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=ucs2
+) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 DROP TABLE `ｱｱｱ`;
 DROP TABLE `ｲｲｲ`;
 DROP TABLE `あああ`;
@@ -207,7 +207,7 @@ Table	Create Table
   PRIMARY KEY (`ｷｷｷ`),
   UNIQUE KEY `ｸｸｸ` (`ｸｸｸ`),
   KEY `ｶｶｶ` (`ｶｶ`)
-) ENGINE=MyISAM DEFAULT CHARSET=ucs2
+) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 ALTER TABLE `ｱｱｱ` DROP INDEX `ｶｶｶ`;
 ALTER TABLE `ｱｱｱ` DROP PRIMARY KEY;
 ALTER TABLE `ｱｱｱ` DROP INDEX `ｸｸｸ`;
@@ -226,7 +226,7 @@ SHOW CREATE TABLE `ｱｱｱ`;
 Table	Create Table
 ｱｱｱ	CREATE TABLE `ｱｱｱ` (
   `ｷｷｷ` char(6) NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=ucs2
+) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 ALTER TABLE `あああ` ADD `かかか` char(1) FIRST;
 ALTER TABLE `あああ` ADD `くくく` char(1) AFTER `ききき`;
 ALTER TABLE `あああ` ADD `けけけ` char(1);
@@ -256,7 +256,7 @@ Table	Create Table
   PRIMARY KEY (`ききき`),
   UNIQUE KEY `くくく` (`くくく`),
   KEY `かかか` (`かか`)
-) ENGINE=MyISAM DEFAULT CHARSET=ucs2
+) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 ALTER TABLE `あああ` DROP INDEX `かかか`;
 ALTER TABLE `あああ` DROP PRIMARY KEY;
 ALTER TABLE `あああ` DROP INDEX `くくく`;
@@ -275,7 +275,7 @@ SHOW CREATE TABLE `あああ`;
 Table	Create Table
 あああ	CREATE TABLE `あああ` (
   `ききき` char(6) NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=ucs2
+) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 ALTER TABLE `龖龖龖` ADD `丄丄丄` char(1) FIRST;
 ALTER TABLE `龖龖龖` ADD `丅丅丅` char(1) AFTER `丂丂丂`;
 ALTER TABLE `龖龖龖` ADD `乚乚乚` char(1);
@@ -305,7 +305,7 @@ Table	Create Table
   PRIMARY KEY (`丂丂丂`),
   UNIQUE KEY `丅丅丅` (`丅丅丅`),
   KEY `丄丄丄` (`丄丄`)
-) ENGINE=MyISAM DEFAULT CHARSET=ucs2
+) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 ALTER TABLE `龖龖龖` DROP INDEX `丄丄丄`;
 ALTER TABLE `龖龖龖` DROP PRIMARY KEY;
 ALTER TABLE `龖龖龖` DROP INDEX `丅丅丅`;
@@ -324,7 +324,7 @@ SHOW CREATE TABLE `龖龖龖`;
 Table	Create Table
 龖龖龖	CREATE TABLE `龖龖龖` (
   `丂丂丂` char(6) NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=ucs2
+) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 DROP TABLE `ｱｱｱ`;
 DROP TABLE `ｲｲｲ`;
 DROP TABLE `あああ`;
@@ -369,7 +369,7 @@ Table	Create Table
   PRIMARY KEY (`ｷｷｷ`),
   UNIQUE KEY `ｸｸｸ` (`ｸｸｸ`),
   KEY `ｶｶｶ` (`ｶｶ`)
-) ENGINE=MEMORY DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 ALTER TABLE `ｱｱｱ` DROP INDEX `ｶｶｶ`;
 ALTER TABLE `ｱｱｱ` DROP PRIMARY KEY;
 ALTER TABLE `ｱｱｱ` DROP INDEX `ｸｸｸ`;
@@ -388,7 +388,7 @@ SHOW CREATE TABLE `ｱｱｱ`;
 Table	Create Table
 ｱｱｱ	CREATE TABLE `ｱｱｱ` (
   `ｷｷｷ` char(6) NOT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 ALTER TABLE `あああ` ADD `かかか` char(1) FIRST;
 ALTER TABLE `あああ` ADD `くくく` char(1) AFTER `ききき`;
 ALTER TABLE `あああ` ADD `けけけ` char(1);
@@ -418,7 +418,7 @@ Table	Create Table
   PRIMARY KEY (`ききき`),
   UNIQUE KEY `くくく` (`くくく`),
   KEY `かかか` (`かか`)
-) ENGINE=MEMORY DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 ALTER TABLE `あああ` DROP INDEX `かかか`;
 ALTER TABLE `あああ` DROP PRIMARY KEY;
 ALTER TABLE `あああ` DROP INDEX `くくく`;
@@ -437,7 +437,7 @@ SHOW CREATE TABLE `あああ`;
 Table	Create Table
 あああ	CREATE TABLE `あああ` (
   `ききき` char(6) NOT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 ALTER TABLE `龖龖龖` ADD `丄丄丄` char(1) FIRST;
 ALTER TABLE `龖龖龖` ADD `丅丅丅` char(1) AFTER `丂丂丂`;
 ALTER TABLE `龖龖龖` ADD `乚乚乚` char(1);
@@ -467,7 +467,7 @@ Table	Create Table
   PRIMARY KEY (`丂丂丂`),
   UNIQUE KEY `丅丅丅` (`丅丅丅`),
   KEY `丄丄丄` (`丄丄`)
-) ENGINE=MEMORY DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 ALTER TABLE `龖龖龖` DROP INDEX `丄丄丄`;
 ALTER TABLE `龖龖龖` DROP PRIMARY KEY;
 ALTER TABLE `龖龖龖` DROP INDEX `丅丅丅`;
@@ -486,7 +486,7 @@ SHOW CREATE TABLE `龖龖龖`;
 Table	Create Table
 龖龖龖	CREATE TABLE `龖龖龖` (
   `丂丂丂` char(6) NOT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 DROP TABLE `ｱｱｱ`;
 DROP TABLE `ｲｲｲ`;
 DROP TABLE `あああ`;
diff --git a/mysql-test/suite/jp/r/jp_alter_ujis.result b/mysql-test/suite/jp/r/jp_alter_ujis.result
index a46da01e1cd..a59c1e5a051 100644
--- a/mysql-test/suite/jp/r/jp_alter_ujis.result
+++ b/mysql-test/suite/jp/r/jp_alter_ujis.result
@@ -44,7 +44,7 @@ Table	Create Table
   PRIMARY KEY (`ｷｷｷ`),
   UNIQUE KEY `ｸｸｸ` (`ｸｸｸ`),
   KEY `ｶｶｶ` (`ｶｶ`)
-) ENGINE=InnoDB DEFAULT CHARSET=ujis
+) ENGINE=InnoDB DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 ALTER TABLE `ｱｱｱ` DROP INDEX `ｶｶｶ`;
 ALTER TABLE `ｱｱｱ` DROP PRIMARY KEY;
 ALTER TABLE `ｱｱｱ` DROP INDEX `ｸｸｸ`;
@@ -63,7 +63,7 @@ SHOW CREATE TABLE `ｱｱｱ`;
 Table	Create Table
 ｱｱｱ	CREATE TABLE `ｱｱｱ` (
   `ｷｷｷ` char(6) NOT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=ujis
+) ENGINE=InnoDB DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 ALTER TABLE `あああ` ADD `かかか` char(1) FIRST;
 ALTER TABLE `あああ` ADD `くくく` char(1) AFTER `ききき`;
 ALTER TABLE `あああ` ADD `けけけ` char(1);
@@ -93,7 +93,7 @@ Table	Create Table
   PRIMARY KEY (`ききき`),
   UNIQUE KEY `くくく` (`くくく`),
   KEY `かかか` (`かか`)
-) ENGINE=InnoDB DEFAULT CHARSET=ujis
+) ENGINE=InnoDB DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 ALTER TABLE `あああ` DROP INDEX `かかか`;
 ALTER TABLE `あああ` DROP PRIMARY KEY;
 ALTER TABLE `あああ` DROP INDEX `くくく`;
@@ -112,7 +112,7 @@ SHOW CREATE TABLE `あああ`;
 Table	Create Table
 あああ	CREATE TABLE `あああ` (
   `ききき` char(6) NOT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=ujis
+) ENGINE=InnoDB DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 ALTER TABLE `龖龖龖` ADD `丄丄丄` char(1) FIRST;
 ALTER TABLE `龖龖龖` ADD `丅丅丅` char(1) AFTER `丂丂丂`;
 ALTER TABLE `龖龖龖` ADD `乚乚乚` char(1);
@@ -142,7 +142,7 @@ Table	Create Table
   PRIMARY KEY (`丂丂丂`),
   UNIQUE KEY `丅丅丅` (`丅丅丅`),
   KEY `丄丄丄` (`丄丄`)
-) ENGINE=InnoDB DEFAULT CHARSET=ujis
+) ENGINE=InnoDB DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 ALTER TABLE `龖龖龖` DROP INDEX `丄丄丄`;
 ALTER TABLE `龖龖龖` DROP PRIMARY KEY;
 ALTER TABLE `龖龖龖` DROP INDEX `丅丅丅`;
@@ -161,7 +161,7 @@ SHOW CREATE TABLE `龖龖龖`;
 Table	Create Table
 龖龖龖	CREATE TABLE `龖龖龖` (
   `丂丂丂` char(6) NOT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=ujis
+) ENGINE=InnoDB DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 DROP TABLE `ｱｱｱ`;
 DROP TABLE `ｲｲｲ`;
 DROP TABLE `あああ`;
@@ -206,7 +206,7 @@ Table	Create Table
   PRIMARY KEY (`ｷｷｷ`),
   UNIQUE KEY `ｸｸｸ` (`ｸｸｸ`),
   KEY `ｶｶｶ` (`ｶｶ`)
-) ENGINE=MyISAM DEFAULT CHARSET=ujis
+) ENGINE=MyISAM DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 ALTER TABLE `ｱｱｱ` DROP INDEX `ｶｶｶ`;
 ALTER TABLE `ｱｱｱ` DROP PRIMARY KEY;
 ALTER TABLE `ｱｱｱ` DROP INDEX `ｸｸｸ`;
@@ -225,7 +225,7 @@ SHOW CREATE TABLE `ｱｱｱ`;
 Table	Create Table
 ｱｱｱ	CREATE TABLE `ｱｱｱ` (
   `ｷｷｷ` char(6) NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=ujis
+) ENGINE=MyISAM DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 ALTER TABLE `あああ` ADD `かかか` char(1) FIRST;
 ALTER TABLE `あああ` ADD `くくく` char(1) AFTER `ききき`;
 ALTER TABLE `あああ` ADD `けけけ` char(1);
@@ -255,7 +255,7 @@ Table	Create Table
   PRIMARY KEY (`ききき`),
   UNIQUE KEY `くくく` (`くくく`),
   KEY `かかか` (`かか`)
-) ENGINE=MyISAM DEFAULT CHARSET=ujis
+) ENGINE=MyISAM DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 ALTER TABLE `あああ` DROP INDEX `かかか`;
 ALTER TABLE `あああ` DROP PRIMARY KEY;
 ALTER TABLE `あああ` DROP INDEX `くくく`;
@@ -274,7 +274,7 @@ SHOW CREATE TABLE `あああ`;
 Table	Create Table
 あああ	CREATE TABLE `あああ` (
   `ききき` char(6) NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=ujis
+) ENGINE=MyISAM DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 ALTER TABLE `龖龖龖` ADD `丄丄丄` char(1) FIRST;
 ALTER TABLE `龖龖龖` ADD `丅丅丅` char(1) AFTER `丂丂丂`;
 ALTER TABLE `龖龖龖` ADD `乚乚乚` char(1);
@@ -304,7 +304,7 @@ Table	Create Table
   PRIMARY KEY (`丂丂丂`),
   UNIQUE KEY `丅丅丅` (`丅丅丅`),
   KEY `丄丄丄` (`丄丄`)
-) ENGINE=MyISAM DEFAULT CHARSET=ujis
+) ENGINE=MyISAM DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 ALTER TABLE `龖龖龖` DROP INDEX `丄丄丄`;
 ALTER TABLE `龖龖龖` DROP PRIMARY KEY;
 ALTER TABLE `龖龖龖` DROP INDEX `丅丅丅`;
@@ -323,7 +323,7 @@ SHOW CREATE TABLE `龖龖龖`;
 Table	Create Table
 龖龖龖	CREATE TABLE `龖龖龖` (
   `丂丂丂` char(6) NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=ujis
+) ENGINE=MyISAM DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 DROP TABLE `ｱｱｱ`;
 DROP TABLE `ｲｲｲ`;
 DROP TABLE `あああ`;
@@ -368,7 +368,7 @@ Table	Create Table
   PRIMARY KEY (`ｷｷｷ`),
   UNIQUE KEY `ｸｸｸ` (`ｸｸｸ`),
   KEY `ｶｶｶ` (`ｶｶ`)
-) ENGINE=MEMORY DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 ALTER TABLE `ｱｱｱ` DROP INDEX `ｶｶｶ`;
 ALTER TABLE `ｱｱｱ` DROP PRIMARY KEY;
 ALTER TABLE `ｱｱｱ` DROP INDEX `ｸｸｸ`;
@@ -387,7 +387,7 @@ SHOW CREATE TABLE `ｱｱｱ`;
 Table	Create Table
 ｱｱｱ	CREATE TABLE `ｱｱｱ` (
   `ｷｷｷ` char(6) NOT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 ALTER TABLE `あああ` ADD `かかか` char(1) FIRST;
 ALTER TABLE `あああ` ADD `くくく` char(1) AFTER `ききき`;
 ALTER TABLE `あああ` ADD `けけけ` char(1);
@@ -417,7 +417,7 @@ Table	Create Table
   PRIMARY KEY (`ききき`),
   UNIQUE KEY `くくく` (`くくく`),
   KEY `かかか` (`かか`)
-) ENGINE=MEMORY DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 ALTER TABLE `あああ` DROP INDEX `かかか`;
 ALTER TABLE `あああ` DROP PRIMARY KEY;
 ALTER TABLE `あああ` DROP INDEX `くくく`;
@@ -436,7 +436,7 @@ SHOW CREATE TABLE `あああ`;
 Table	Create Table
 あああ	CREATE TABLE `あああ` (
   `ききき` char(6) NOT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 ALTER TABLE `龖龖龖` ADD `丄丄丄` char(1) FIRST;
 ALTER TABLE `龖龖龖` ADD `丅丅丅` char(1) AFTER `丂丂丂`;
 ALTER TABLE `龖龖龖` ADD `乚乚乚` char(1);
@@ -466,7 +466,7 @@ Table	Create Table
   PRIMARY KEY (`丂丂丂`),
   UNIQUE KEY `丅丅丅` (`丅丅丅`),
   KEY `丄丄丄` (`丄丄`)
-) ENGINE=MEMORY DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 ALTER TABLE `龖龖龖` DROP INDEX `丄丄丄`;
 ALTER TABLE `龖龖龖` DROP PRIMARY KEY;
 ALTER TABLE `龖龖龖` DROP INDEX `丅丅丅`;
@@ -485,7 +485,7 @@ SHOW CREATE TABLE `龖龖龖`;
 Table	Create Table
 龖龖龖	CREATE TABLE `龖龖龖` (
   `丂丂丂` char(6) NOT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 DROP TABLE `ｱｱｱ`;
 DROP TABLE `ｲｲｲ`;
 DROP TABLE `あああ`;
diff --git a/mysql-test/suite/jp/r/jp_alter_utf8.result b/mysql-test/suite/jp/r/jp_alter_utf8.result
index b6a6129dc09..545b127415c 100644
--- a/mysql-test/suite/jp/r/jp_alter_utf8.result
+++ b/mysql-test/suite/jp/r/jp_alter_utf8.result
@@ -44,7 +44,7 @@ Table	Create Table
   PRIMARY KEY (`鐔件酬鐔�`),
   UNIQUE KEY `鐔醐集鐔�` (`鐔醐集鐔�`),
   KEY `鐔駈酋鐔�` (`鐔駈酋`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 ALTER TABLE `鐔縁襲鐔�` DROP INDEX `鐔駈酋鐔�`;
 ALTER TABLE `鐔縁襲鐔�` DROP PRIMARY KEY;
 ALTER TABLE `鐔縁襲鐔�` DROP INDEX `鐔醐集鐔�`;
@@ -63,7 +63,7 @@ SHOW CREATE TABLE `鐔縁襲鐔�`;
 Table	Create Table
 鐔縁襲鐔�	CREATE TABLE `鐔縁襲鐔�` (
   `鐔件酬鐔�` char(6) NOT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 ALTER TABLE `���������` ADD `���������` char(1) FIRST;
 ALTER TABLE `���������` ADD `���������` char(1) AFTER `���������`;
 ALTER TABLE `���������` ADD `���������` char(1);
@@ -93,7 +93,7 @@ Table	Create Table
   PRIMARY KEY (`���������`),
   UNIQUE KEY `���������` (`���������`),
   KEY `���������` (`������`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 ALTER TABLE `���������` DROP INDEX `���������`;
 ALTER TABLE `���������` DROP PRIMARY KEY;
 ALTER TABLE `���������` DROP INDEX `���������`;
@@ -112,7 +112,7 @@ SHOW CREATE TABLE `���������`;
 Table	Create Table
 ���������	CREATE TABLE `���������` (
   `���������` char(6) NOT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 ALTER TABLE `蘊�蘊�蘊�` ADD `筝�筝�筝�` char(1) FIRST;
 ALTER TABLE `蘊�蘊�蘊�` ADD `筝�筝�筝�` char(1) AFTER `筝�筝�筝�`;
 ALTER TABLE `蘊�蘊�蘊�` ADD `箙�箙�箙�` char(1);
@@ -142,7 +142,7 @@ Table	Create Table
   PRIMARY KEY (`筝�筝�筝�`),
   UNIQUE KEY `筝�筝�筝�` (`筝�筝�筝�`),
   KEY `筝�筝�筝�` (`筝�筝�`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 ALTER TABLE `蘊�蘊�蘊�` DROP INDEX `筝�筝�筝�`;
 ALTER TABLE `蘊�蘊�蘊�` DROP PRIMARY KEY;
 ALTER TABLE `蘊�蘊�蘊�` DROP INDEX `筝�筝�筝�`;
@@ -161,7 +161,7 @@ SHOW CREATE TABLE `蘊�蘊�蘊�`;
 Table	Create Table
 蘊�蘊�蘊�	CREATE TABLE `蘊�蘊�蘊�` (
   `筝�筝�筝�` char(6) NOT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 DROP TABLE `鐔縁襲鐔�`;
 DROP TABLE `鐔駕讐鐔�`;
 DROP TABLE `���������`;
@@ -206,7 +206,7 @@ Table	Create Table
   PRIMARY KEY (`鐔件酬鐔�`),
   UNIQUE KEY `鐔醐集鐔�` (`鐔醐集鐔�`),
   KEY `鐔駈酋鐔�` (`鐔駈酋`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 ALTER TABLE `鐔縁襲鐔�` DROP INDEX `鐔駈酋鐔�`;
 ALTER TABLE `鐔縁襲鐔�` DROP PRIMARY KEY;
 ALTER TABLE `鐔縁襲鐔�` DROP INDEX `鐔醐集鐔�`;
@@ -225,7 +225,7 @@ SHOW CREATE TABLE `鐔縁襲鐔�`;
 Table	Create Table
 鐔縁襲鐔�	CREATE TABLE `鐔縁襲鐔�` (
   `鐔件酬鐔�` char(6) NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 ALTER TABLE `���������` ADD `���������` char(1) FIRST;
 ALTER TABLE `���������` ADD `���������` char(1) AFTER `���������`;
 ALTER TABLE `���������` ADD `���������` char(1);
@@ -255,7 +255,7 @@ Table	Create Table
   PRIMARY KEY (`���������`),
   UNIQUE KEY `���������` (`���������`),
   KEY `���������` (`������`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 ALTER TABLE `���������` DROP INDEX `���������`;
 ALTER TABLE `���������` DROP PRIMARY KEY;
 ALTER TABLE `���������` DROP INDEX `���������`;
@@ -274,7 +274,7 @@ SHOW CREATE TABLE `���������`;
 Table	Create Table
 ���������	CREATE TABLE `���������` (
   `���������` char(6) NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 ALTER TABLE `蘊�蘊�蘊�` ADD `筝�筝�筝�` char(1) FIRST;
 ALTER TABLE `蘊�蘊�蘊�` ADD `筝�筝�筝�` char(1) AFTER `筝�筝�筝�`;
 ALTER TABLE `蘊�蘊�蘊�` ADD `箙�箙�箙�` char(1);
@@ -304,7 +304,7 @@ Table	Create Table
   PRIMARY KEY (`筝�筝�筝�`),
   UNIQUE KEY `筝�筝�筝�` (`筝�筝�筝�`),
   KEY `筝�筝�筝�` (`筝�筝�`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 ALTER TABLE `蘊�蘊�蘊�` DROP INDEX `筝�筝�筝�`;
 ALTER TABLE `蘊�蘊�蘊�` DROP PRIMARY KEY;
 ALTER TABLE `蘊�蘊�蘊�` DROP INDEX `筝�筝�筝�`;
@@ -323,7 +323,7 @@ SHOW CREATE TABLE `蘊�蘊�蘊�`;
 Table	Create Table
 蘊�蘊�蘊�	CREATE TABLE `蘊�蘊�蘊�` (
   `筝�筝�筝�` char(6) NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 DROP TABLE `鐔縁襲鐔�`;
 DROP TABLE `鐔駕讐鐔�`;
 DROP TABLE `���������`;
@@ -368,7 +368,7 @@ Table	Create Table
   PRIMARY KEY (`鐔件酬鐔�`),
   UNIQUE KEY `鐔醐集鐔�` (`鐔醐集鐔�`),
   KEY `鐔駈酋鐔�` (`鐔駈酋`)
-) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 ALTER TABLE `鐔縁襲鐔�` DROP INDEX `鐔駈酋鐔�`;
 ALTER TABLE `鐔縁襲鐔�` DROP PRIMARY KEY;
 ALTER TABLE `鐔縁襲鐔�` DROP INDEX `鐔醐集鐔�`;
@@ -387,7 +387,7 @@ SHOW CREATE TABLE `鐔縁襲鐔�`;
 Table	Create Table
 鐔縁襲鐔�	CREATE TABLE `鐔縁襲鐔�` (
   `鐔件酬鐔�` char(6) NOT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 ALTER TABLE `���������` ADD `���������` char(1) FIRST;
 ALTER TABLE `���������` ADD `���������` char(1) AFTER `���������`;
 ALTER TABLE `���������` ADD `���������` char(1);
@@ -417,7 +417,7 @@ Table	Create Table
   PRIMARY KEY (`���������`),
   UNIQUE KEY `���������` (`���������`),
   KEY `���������` (`������`)
-) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 ALTER TABLE `���������` DROP INDEX `���������`;
 ALTER TABLE `���������` DROP PRIMARY KEY;
 ALTER TABLE `���������` DROP INDEX `���������`;
@@ -436,7 +436,7 @@ SHOW CREATE TABLE `���������`;
 Table	Create Table
 ���������	CREATE TABLE `���������` (
   `���������` char(6) NOT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 ALTER TABLE `蘊�蘊�蘊�` ADD `筝�筝�筝�` char(1) FIRST;
 ALTER TABLE `蘊�蘊�蘊�` ADD `筝�筝�筝�` char(1) AFTER `筝�筝�筝�`;
 ALTER TABLE `蘊�蘊�蘊�` ADD `箙�箙�箙�` char(1);
@@ -466,7 +466,7 @@ Table	Create Table
   PRIMARY KEY (`筝�筝�筝�`),
   UNIQUE KEY `筝�筝�筝�` (`筝�筝�筝�`),
   KEY `筝�筝�筝�` (`筝�筝�`)
-) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 ALTER TABLE `蘊�蘊�蘊�` DROP INDEX `筝�筝�筝�`;
 ALTER TABLE `蘊�蘊�蘊�` DROP PRIMARY KEY;
 ALTER TABLE `蘊�蘊�蘊�` DROP INDEX `筝�筝�筝�`;
@@ -485,7 +485,7 @@ SHOW CREATE TABLE `蘊�蘊�蘊�`;
 Table	Create Table
 蘊�蘊�蘊�	CREATE TABLE `蘊�蘊�蘊�` (
   `筝�筝�筝�` char(6) NOT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 DROP TABLE `鐔縁襲鐔�`;
 DROP TABLE `鐔駕讐鐔�`;
 DROP TABLE `���������`;
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 b3a5a52f0d1..0a78d26ea0f 100644
--- a/mysql-test/suite/jp/r/jp_create_tbl_sjis.result
+++ b/mysql-test/suite/jp/r/jp_create_tbl_sjis.result
@@ -97,77 +97,77 @@ SHOW CREATE TABLE `臼�`;
 Table	Create Table
 臼�	CREATE TABLE `臼�` (
   `橋�` char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=ujis
+) ENGINE=InnoDB DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 SHOW CREATE TABLE `臆�`;
 Table	Create Table
 臆�	CREATE TABLE `臆�` (
   `祁�` char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=ujis
+) ENGINE=InnoDB DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 SHOW CREATE TABLE `崖�`;
 Table	Create Table
 崖�	CREATE TABLE `崖�` (
   `幻�` char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=sjis
+) ENGINE=InnoDB DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 SHOW CREATE TABLE `幹�`;
 Table	Create Table
 幹�	CREATE TEMPORARY TABLE `幹�` (
   `更�` char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=sjis
+) ENGINE=InnoDB DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 SHOW CREATE TABLE `亀�`;
 Table	Create Table
 亀�	CREATE TEMPORARY TABLE `亀�` (
   `査�` char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=sjis
+) ENGINE=InnoDB DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 SHOW CREATE TABLE `������`;
 Table	Create Table
 ������	CREATE TABLE `������` (
   `������` char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=sjis
+) ENGINE=InnoDB DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 SHOW CREATE TABLE `������`;
 Table	Create Table
 ������	CREATE TABLE `������` (
   `������` char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=sjis
+) ENGINE=InnoDB DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 SHOW CREATE TABLE `������`;
 Table	Create Table
 ������	CREATE TABLE `������` (
   `������` char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=sjis
+) ENGINE=InnoDB DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 SHOW CREATE TABLE `������`;
 Table	Create Table
 ������	CREATE TEMPORARY TABLE `������` (
   `������` char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=sjis
+) ENGINE=InnoDB DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 SHOW CREATE TABLE `������`;
 Table	Create Table
 ������	CREATE TEMPORARY TABLE `������` (
   `������` char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=sjis
+) ENGINE=InnoDB DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 SHOW CREATE TABLE `�\�\�\`;
 Table	Create Table
 �\�\�\	CREATE TABLE `�\�\�\` (
   `�\�\�\` char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=sjis
+) ENGINE=InnoDB DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 SHOW CREATE TABLE `�\�\�\`;
 Table	Create Table
 �\�\�\	CREATE TABLE `�\�\�\` (
   `�\�\�\` char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=sjis
+) ENGINE=InnoDB DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 SHOW CREATE TABLE `�\�\�\`;
 Table	Create Table
 �\�\�\	CREATE TABLE `�\�\�\` (
   `�\�\�\` char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=sjis
+) ENGINE=InnoDB DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 SHOW CREATE TABLE `�\�\�\`;
 Table	Create Table
 �\�\�\	CREATE TEMPORARY TABLE `�\�\�\` (
   `�\�\�\` char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=sjis
+) ENGINE=InnoDB DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 SHOW CREATE TABLE `�\�\�\`;
 Table	Create Table
 �\�\�\	CREATE TEMPORARY TABLE `�\�\�\` (
   `�\�\�\` char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=sjis
+) ENGINE=InnoDB DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 DROP TABLE `臼�`;
 DROP TABLE `臆�`;
 DROP TABLE `崖�`;
@@ -265,77 +265,77 @@ SHOW CREATE TABLE `臼�`;
 Table	Create Table
 臼�	CREATE TABLE `臼�` (
   `橋�` char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=sjis
+) ENGINE=MyISAM DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 SHOW CREATE TABLE `臆�`;
 Table	Create Table
 臆�	CREATE TABLE `臆�` (
   `祁�` char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=sjis
+) ENGINE=MyISAM DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 SHOW CREATE TABLE `崖�`;
 Table	Create Table
 崖�	CREATE TABLE `崖�` (
   `幻�` char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=sjis
+) ENGINE=MyISAM DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 SHOW CREATE TABLE `幹�`;
 Table	Create Table
 幹�	CREATE TEMPORARY TABLE `幹�` (
   `更�` char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=sjis
+) ENGINE=MyISAM DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 SHOW CREATE TABLE `亀�`;
 Table	Create Table
 亀�	CREATE TEMPORARY TABLE `亀�` (
   `査�` char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=sjis
+) ENGINE=MyISAM DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 SHOW CREATE TABLE `������`;
 Table	Create Table
 ������	CREATE TABLE `������` (
   `������` char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=sjis
+) ENGINE=MyISAM DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 SHOW CREATE TABLE `������`;
 Table	Create Table
 ������	CREATE TABLE `������` (
   `������` char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=sjis
+) ENGINE=MyISAM DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 SHOW CREATE TABLE `������`;
 Table	Create Table
 ������	CREATE TABLE `������` (
   `������` char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=sjis
+) ENGINE=MyISAM DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 SHOW CREATE TABLE `������`;
 Table	Create Table
 ������	CREATE TEMPORARY TABLE `������` (
   `������` char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=sjis
+) ENGINE=MyISAM DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 SHOW CREATE TABLE `������`;
 Table	Create Table
 ������	CREATE TEMPORARY TABLE `������` (
   `������` char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=sjis
+) ENGINE=MyISAM DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 SHOW CREATE TABLE `�\�\�\`;
 Table	Create Table
 �\�\�\	CREATE TABLE `�\�\�\` (
   `�\�\�\` char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=sjis
+) ENGINE=MyISAM DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 SHOW CREATE TABLE `�\�\�\`;
 Table	Create Table
 �\�\�\	CREATE TABLE `�\�\�\` (
   `�\�\�\` char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=sjis
+) ENGINE=MyISAM DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 SHOW CREATE TABLE `�\�\�\`;
 Table	Create Table
 �\�\�\	CREATE TABLE `�\�\�\` (
   `�\�\�\` char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=sjis
+) ENGINE=MyISAM DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 SHOW CREATE TABLE `�\�\�\`;
 Table	Create Table
 �\�\�\	CREATE TEMPORARY TABLE `�\�\�\` (
   `�\�\�\` char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=sjis
+) ENGINE=MyISAM DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 SHOW CREATE TABLE `�\�\�\`;
 Table	Create Table
 �\�\�\	CREATE TEMPORARY TABLE `�\�\�\` (
   `�\�\�\` char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=sjis
+) ENGINE=MyISAM DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 DROP TABLE `臼�`;
 DROP TABLE `臆�`;
 DROP TABLE `崖�`;
@@ -433,77 +433,77 @@ SHOW CREATE TABLE `臼�`;
 Table	Create Table
 臼�	CREATE TABLE `臼�` (
   `橋�` char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 SHOW CREATE TABLE `臆�`;
 Table	Create Table
 臆�	CREATE TABLE `臆�` (
   `祁�` char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 SHOW CREATE TABLE `崖�`;
 Table	Create Table
 崖�	CREATE TABLE `崖�` (
   `幻�` char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 SHOW CREATE TABLE `幹�`;
 Table	Create Table
 幹�	CREATE TEMPORARY TABLE `幹�` (
   `更�` char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 SHOW CREATE TABLE `亀�`;
 Table	Create Table
 亀�	CREATE TEMPORARY TABLE `亀�` (
   `査�` char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 SHOW CREATE TABLE `������`;
 Table	Create Table
 ������	CREATE TABLE `������` (
   `������` char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 SHOW CREATE TABLE `������`;
 Table	Create Table
 ������	CREATE TABLE `������` (
   `������` char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 SHOW CREATE TABLE `������`;
 Table	Create Table
 ������	CREATE TABLE `������` (
   `������` char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 SHOW CREATE TABLE `������`;
 Table	Create Table
 ������	CREATE TEMPORARY TABLE `������` (
   `������` char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 SHOW CREATE TABLE `������`;
 Table	Create Table
 ������	CREATE TEMPORARY TABLE `������` (
   `������` char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 SHOW CREATE TABLE `�\�\�\`;
 Table	Create Table
 �\�\�\	CREATE TABLE `�\�\�\` (
   `�\�\�\` char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 SHOW CREATE TABLE `�\�\�\`;
 Table	Create Table
 �\�\�\	CREATE TABLE `�\�\�\` (
   `�\�\�\` char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 SHOW CREATE TABLE `�\�\�\`;
 Table	Create Table
 �\�\�\	CREATE TABLE `�\�\�\` (
   `�\�\�\` char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 SHOW CREATE TABLE `�\�\�\`;
 Table	Create Table
 �\�\�\	CREATE TEMPORARY TABLE `�\�\�\` (
   `�\�\�\` char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 SHOW CREATE TABLE `�\�\�\`;
 Table	Create Table
 �\�\�\	CREATE TEMPORARY TABLE `�\�\�\` (
   `�\�\�\` char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 DROP TABLE `臼�`;
 DROP TABLE `臆�`;
 DROP TABLE `崖�`;
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 5ca3d84465e..d9dca059550 100644
--- a/mysql-test/suite/jp/r/jp_create_tbl_ucs2.result
+++ b/mysql-test/suite/jp/r/jp_create_tbl_ucs2.result
@@ -97,77 +97,77 @@ SHOW CREATE TABLE `ｱｱｱ`;
 Table	Create Table
 ｱｱｱ	CREATE TABLE `ｱｱｱ` (
   `ｶｶｶ` char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=ucs2
+) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 SHOW CREATE TABLE `ｲｲｲ`;
 Table	Create Table
 ｲｲｲ	CREATE TABLE `ｲｲｲ` (
   `ｷｷｷ` char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=ucs2
+) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 SHOW CREATE TABLE `ｳｳｳ`;
 Table	Create Table
 ｳｳｳ	CREATE TABLE `ｳｳｳ` (
   `ｸｸｸ` char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=ucs2
+) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 SHOW CREATE TABLE `ｴｴｴ`;
 Table	Create Table
 ｴｴｴ	CREATE TEMPORARY TABLE `ｴｴｴ` (
   `ｹｹｹ` char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=ucs2
+) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 SHOW CREATE TABLE `ｵｵｵ`;
 Table	Create Table
 ｵｵｵ	CREATE TEMPORARY TABLE `ｵｵｵ` (
   `ｺｺｺ` char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=ucs2
+) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
 あああ	CREATE TABLE `あああ` (
   `かかか` char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=ucs2
+) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 SHOW CREATE TABLE `いいい`;
 Table	Create Table
 いいい	CREATE TABLE `いいい` (
   `ききき` char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=ucs2
+) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 SHOW CREATE TABLE `ううう`;
 Table	Create Table
 ううう	CREATE TABLE `ううう` (
   `くくく` char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=ucs2
+) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 SHOW CREATE TABLE `えええ`;
 Table	Create Table
 えええ	CREATE TEMPORARY TABLE `えええ` (
   `けけけ` char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=ucs2
+) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 SHOW CREATE TABLE `おおお`;
 Table	Create Table
 おおお	CREATE TEMPORARY TABLE `おおお` (
   `こここ` char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=ucs2
+) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 SHOW CREATE TABLE `龖龖龖`;
 Table	Create Table
 龖龖龖	CREATE TABLE `龖龖龖` (
   `丂丂丂` char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=ucs2
+) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 SHOW CREATE TABLE `龗龗龗`;
 Table	Create Table
 龗龗龗	CREATE TABLE `龗龗龗` (
   `丄丄丄` char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=ucs2
+) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 SHOW CREATE TABLE `龞龞龞`;
 Table	Create Table
 龞龞龞	CREATE TABLE `龞龞龞` (
   `丅丅丅` char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=ucs2
+) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 SHOW CREATE TABLE `龡龡龡`;
 Table	Create Table
 龡龡龡	CREATE TEMPORARY TABLE `龡龡龡` (
   `丌丌丌` char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=ucs2
+) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 SHOW CREATE TABLE `龢龢龢`;
 Table	Create Table
 龢龢龢	CREATE TEMPORARY TABLE `龢龢龢` (
   `丒丒丒` char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=ucs2
+) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 DROP TABLE `ｱｱｱ`;
 DROP TABLE `ｲｲｲ`;
 DROP TABLE `ｳｳｳ`;
@@ -265,77 +265,77 @@ SHOW CREATE TABLE `ｱｱｱ`;
 Table	Create Table
 ｱｱｱ	CREATE TABLE `ｱｱｱ` (
   `ｶｶｶ` char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=ucs2
+) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 SHOW CREATE TABLE `ｲｲｲ`;
 Table	Create Table
 ｲｲｲ	CREATE TABLE `ｲｲｲ` (
   `ｷｷｷ` char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=ucs2
+) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 SHOW CREATE TABLE `ｳｳｳ`;
 Table	Create Table
 ｳｳｳ	CREATE TABLE `ｳｳｳ` (
   `ｸｸｸ` char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=ucs2
+) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 SHOW CREATE TABLE `ｴｴｴ`;
 Table	Create Table
 ｴｴｴ	CREATE TEMPORARY TABLE `ｴｴｴ` (
   `ｹｹｹ` char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=ucs2
+) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 SHOW CREATE TABLE `ｵｵｵ`;
 Table	Create Table
 ｵｵｵ	CREATE TEMPORARY TABLE `ｵｵｵ` (
   `ｺｺｺ` char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=ucs2
+) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
 あああ	CREATE TABLE `あああ` (
   `かかか` char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=ucs2
+) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 SHOW CREATE TABLE `いいい`;
 Table	Create Table
 いいい	CREATE TABLE `いいい` (
   `ききき` char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=ucs2
+) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 SHOW CREATE TABLE `ううう`;
 Table	Create Table
 ううう	CREATE TABLE `ううう` (
   `くくく` char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=ucs2
+) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 SHOW CREATE TABLE `えええ`;
 Table	Create Table
 えええ	CREATE TEMPORARY TABLE `えええ` (
   `けけけ` char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=ucs2
+) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 SHOW CREATE TABLE `おおお`;
 Table	Create Table
 おおお	CREATE TEMPORARY TABLE `おおお` (
   `こここ` char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=ucs2
+) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 SHOW CREATE TABLE `龖龖龖`;
 Table	Create Table
 龖龖龖	CREATE TABLE `龖龖龖` (
   `丂丂丂` char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=ucs2
+) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 SHOW CREATE TABLE `龗龗龗`;
 Table	Create Table
 龗龗龗	CREATE TABLE `龗龗龗` (
   `丄丄丄` char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=ucs2
+) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 SHOW CREATE TABLE `龞龞龞`;
 Table	Create Table
 龞龞龞	CREATE TABLE `龞龞龞` (
   `丅丅丅` char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=ucs2
+) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 SHOW CREATE TABLE `龡龡龡`;
 Table	Create Table
 龡龡龡	CREATE TEMPORARY TABLE `龡龡龡` (
   `丌丌丌` char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=ucs2
+) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 SHOW CREATE TABLE `龢龢龢`;
 Table	Create Table
 龢龢龢	CREATE TEMPORARY TABLE `龢龢龢` (
   `丒丒丒` char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=ucs2
+) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 DROP TABLE `ｱｱｱ`;
 DROP TABLE `ｲｲｲ`;
 DROP TABLE `ｳｳｳ`;
@@ -433,77 +433,77 @@ SHOW CREATE TABLE `ｱｱｱ`;
 Table	Create Table
 ｱｱｱ	CREATE TABLE `ｱｱｱ` (
   `ｶｶｶ` char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 SHOW CREATE TABLE `ｲｲｲ`;
 Table	Create Table
 ｲｲｲ	CREATE TABLE `ｲｲｲ` (
   `ｷｷｷ` char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 SHOW CREATE TABLE `ｳｳｳ`;
 Table	Create Table
 ｳｳｳ	CREATE TABLE `ｳｳｳ` (
   `ｸｸｸ` char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 SHOW CREATE TABLE `ｴｴｴ`;
 Table	Create Table
 ｴｴｴ	CREATE TEMPORARY TABLE `ｴｴｴ` (
   `ｹｹｹ` char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 SHOW CREATE TABLE `ｵｵｵ`;
 Table	Create Table
 ｵｵｵ	CREATE TEMPORARY TABLE `ｵｵｵ` (
   `ｺｺｺ` char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
 あああ	CREATE TABLE `あああ` (
   `かかか` char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 SHOW CREATE TABLE `いいい`;
 Table	Create Table
 いいい	CREATE TABLE `いいい` (
   `ききき` char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 SHOW CREATE TABLE `ううう`;
 Table	Create Table
 ううう	CREATE TABLE `ううう` (
   `くくく` char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 SHOW CREATE TABLE `えええ`;
 Table	Create Table
 えええ	CREATE TEMPORARY TABLE `えええ` (
   `けけけ` char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 SHOW CREATE TABLE `おおお`;
 Table	Create Table
 おおお	CREATE TEMPORARY TABLE `おおお` (
   `こここ` char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 SHOW CREATE TABLE `龖龖龖`;
 Table	Create Table
 龖龖龖	CREATE TABLE `龖龖龖` (
   `丂丂丂` char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 SHOW CREATE TABLE `龗龗龗`;
 Table	Create Table
 龗龗龗	CREATE TABLE `龗龗龗` (
   `丄丄丄` char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 SHOW CREATE TABLE `龞龞龞`;
 Table	Create Table
 龞龞龞	CREATE TABLE `龞龞龞` (
   `丅丅丅` char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 SHOW CREATE TABLE `龡龡龡`;
 Table	Create Table
 龡龡龡	CREATE TEMPORARY TABLE `龡龡龡` (
   `丌丌丌` char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 SHOW CREATE TABLE `龢龢龢`;
 Table	Create Table
 龢龢龢	CREATE TEMPORARY TABLE `龢龢龢` (
   `丒丒丒` char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 DROP TABLE `ｱｱｱ`;
 DROP TABLE `ｲｲｲ`;
 DROP TABLE `ｳｳｳ`;
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 f79e131ec5f..d1f247fc5fe 100644
--- a/mysql-test/suite/jp/r/jp_create_tbl_ujis.result
+++ b/mysql-test/suite/jp/r/jp_create_tbl_ujis.result
@@ -97,77 +97,77 @@ SHOW CREATE TABLE `ｱｱｱ`;
 Table	Create Table
 ｱｱｱ	CREATE TABLE `ｱｱｱ` (
   `ｶｶｶ` char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=ujis
+) ENGINE=InnoDB DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 SHOW CREATE TABLE `ｲｲｲ`;
 Table	Create Table
 ｲｲｲ	CREATE TABLE `ｲｲｲ` (
   `ｷｷｷ` char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=ujis
+) ENGINE=InnoDB DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 SHOW CREATE TABLE `ｳｳｳ`;
 Table	Create Table
 ｳｳｳ	CREATE TABLE `ｳｳｳ` (
   `ｸｸｸ` char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=ujis
+) ENGINE=InnoDB DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 SHOW CREATE TABLE `ｴｴｴ`;
 Table	Create Table
 ｴｴｴ	CREATE TEMPORARY TABLE `ｴｴｴ` (
   `ｹｹｹ` char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=ujis
+) ENGINE=InnoDB DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 SHOW CREATE TABLE `ｵｵｵ`;
 Table	Create Table
 ｵｵｵ	CREATE TEMPORARY TABLE `ｵｵｵ` (
   `ｺｺｺ` char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=ujis
+) ENGINE=InnoDB DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
 あああ	CREATE TABLE `あああ` (
   `かかか` char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=ujis
+) ENGINE=InnoDB DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 SHOW CREATE TABLE `いいい`;
 Table	Create Table
 いいい	CREATE TABLE `いいい` (
   `ききき` char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=ujis
+) ENGINE=InnoDB DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 SHOW CREATE TABLE `ううう`;
 Table	Create Table
 ううう	CREATE TABLE `ううう` (
   `くくく` char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=ujis
+) ENGINE=InnoDB DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 SHOW CREATE TABLE `えええ`;
 Table	Create Table
 えええ	CREATE TEMPORARY TABLE `えええ` (
   `けけけ` char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=ujis
+) ENGINE=InnoDB DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 SHOW CREATE TABLE `おおお`;
 Table	Create Table
 おおお	CREATE TEMPORARY TABLE `おおお` (
   `こここ` char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=ujis
+) ENGINE=InnoDB DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 SHOW CREATE TABLE `龖龖龖`;
 Table	Create Table
 龖龖龖	CREATE TABLE `龖龖龖` (
   `丂丂丂` char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=ujis
+) ENGINE=InnoDB DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 SHOW CREATE TABLE `龗龗龗`;
 Table	Create Table
 龗龗龗	CREATE TABLE `龗龗龗` (
   `丄丄丄` char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=ujis
+) ENGINE=InnoDB DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 SHOW CREATE TABLE `龞龞龞`;
 Table	Create Table
 龞龞龞	CREATE TABLE `龞龞龞` (
   `丅丅丅` char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=ujis
+) ENGINE=InnoDB DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 SHOW CREATE TABLE `龡龡龡`;
 Table	Create Table
 龡龡龡	CREATE TEMPORARY TABLE `龡龡龡` (
   `丌丌丌` char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=ujis
+) ENGINE=InnoDB DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 SHOW CREATE TABLE `龢龢龢`;
 Table	Create Table
 龢龢龢	CREATE TEMPORARY TABLE `龢龢龢` (
   `丒丒丒` char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=ujis
+) ENGINE=InnoDB DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 DROP TABLE `ｱｱｱ`;
 DROP TABLE `ｲｲｲ`;
 DROP TABLE `ｳｳｳ`;
@@ -265,77 +265,77 @@ SHOW CREATE TABLE `ｱｱｱ`;
 Table	Create Table
 ｱｱｱ	CREATE TABLE `ｱｱｱ` (
   `ｶｶｶ` char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=ujis
+) ENGINE=MyISAM DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 SHOW CREATE TABLE `ｲｲｲ`;
 Table	Create Table
 ｲｲｲ	CREATE TABLE `ｲｲｲ` (
   `ｷｷｷ` char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=ujis
+) ENGINE=MyISAM DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 SHOW CREATE TABLE `ｳｳｳ`;
 Table	Create Table
 ｳｳｳ	CREATE TABLE `ｳｳｳ` (
   `ｸｸｸ` char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=ujis
+) ENGINE=MyISAM DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 SHOW CREATE TABLE `ｴｴｴ`;
 Table	Create Table
 ｴｴｴ	CREATE TEMPORARY TABLE `ｴｴｴ` (
   `ｹｹｹ` char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=ujis
+) ENGINE=MyISAM DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 SHOW CREATE TABLE `ｵｵｵ`;
 Table	Create Table
 ｵｵｵ	CREATE TEMPORARY TABLE `ｵｵｵ` (
   `ｺｺｺ` char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=ujis
+) ENGINE=MyISAM DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
 あああ	CREATE TABLE `あああ` (
   `かかか` char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=ujis
+) ENGINE=MyISAM DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 SHOW CREATE TABLE `いいい`;
 Table	Create Table
 いいい	CREATE TABLE `いいい` (
   `ききき` char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=ujis
+) ENGINE=MyISAM DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 SHOW CREATE TABLE `ううう`;
 Table	Create Table
 ううう	CREATE TABLE `ううう` (
   `くくく` char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=ujis
+) ENGINE=MyISAM DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 SHOW CREATE TABLE `えええ`;
 Table	Create Table
 えええ	CREATE TEMPORARY TABLE `えええ` (
   `けけけ` char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=ujis
+) ENGINE=MyISAM DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 SHOW CREATE TABLE `おおお`;
 Table	Create Table
 おおお	CREATE TEMPORARY TABLE `おおお` (
   `こここ` char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=ujis
+) ENGINE=MyISAM DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 SHOW CREATE TABLE `龖龖龖`;
 Table	Create Table
 龖龖龖	CREATE TABLE `龖龖龖` (
   `丂丂丂` char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=ujis
+) ENGINE=MyISAM DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 SHOW CREATE TABLE `龗龗龗`;
 Table	Create Table
 龗龗龗	CREATE TABLE `龗龗龗` (
   `丄丄丄` char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=ujis
+) ENGINE=MyISAM DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 SHOW CREATE TABLE `龞龞龞`;
 Table	Create Table
 龞龞龞	CREATE TABLE `龞龞龞` (
   `丅丅丅` char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=ujis
+) ENGINE=MyISAM DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 SHOW CREATE TABLE `龡龡龡`;
 Table	Create Table
 龡龡龡	CREATE TEMPORARY TABLE `龡龡龡` (
   `丌丌丌` char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=ujis
+) ENGINE=MyISAM DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 SHOW CREATE TABLE `龢龢龢`;
 Table	Create Table
 龢龢龢	CREATE TEMPORARY TABLE `龢龢龢` (
   `丒丒丒` char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=ujis
+) ENGINE=MyISAM DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 DROP TABLE `ｱｱｱ`;
 DROP TABLE `ｲｲｲ`;
 DROP TABLE `ｳｳｳ`;
@@ -433,77 +433,77 @@ SHOW CREATE TABLE `ｱｱｱ`;
 Table	Create Table
 ｱｱｱ	CREATE TABLE `ｱｱｱ` (
   `ｶｶｶ` char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 SHOW CREATE TABLE `ｲｲｲ`;
 Table	Create Table
 ｲｲｲ	CREATE TABLE `ｲｲｲ` (
   `ｷｷｷ` char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 SHOW CREATE TABLE `ｳｳｳ`;
 Table	Create Table
 ｳｳｳ	CREATE TABLE `ｳｳｳ` (
   `ｸｸｸ` char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 SHOW CREATE TABLE `ｴｴｴ`;
 Table	Create Table
 ｴｴｴ	CREATE TEMPORARY TABLE `ｴｴｴ` (
   `ｹｹｹ` char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 SHOW CREATE TABLE `ｵｵｵ`;
 Table	Create Table
 ｵｵｵ	CREATE TEMPORARY TABLE `ｵｵｵ` (
   `ｺｺｺ` char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 SHOW CREATE TABLE `あああ`;
 Table	Create Table
 あああ	CREATE TABLE `あああ` (
   `かかか` char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 SHOW CREATE TABLE `いいい`;
 Table	Create Table
 いいい	CREATE TABLE `いいい` (
   `ききき` char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 SHOW CREATE TABLE `ううう`;
 Table	Create Table
 ううう	CREATE TABLE `ううう` (
   `くくく` char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 SHOW CREATE TABLE `えええ`;
 Table	Create Table
 えええ	CREATE TEMPORARY TABLE `えええ` (
   `けけけ` char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 SHOW CREATE TABLE `おおお`;
 Table	Create Table
 おおお	CREATE TEMPORARY TABLE `おおお` (
   `こここ` char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 SHOW CREATE TABLE `龖龖龖`;
 Table	Create Table
 龖龖龖	CREATE TABLE `龖龖龖` (
   `丂丂丂` char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 SHOW CREATE TABLE `龗龗龗`;
 Table	Create Table
 龗龗龗	CREATE TABLE `龗龗龗` (
   `丄丄丄` char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 SHOW CREATE TABLE `龞龞龞`;
 Table	Create Table
 龞龞龞	CREATE TABLE `龞龞龞` (
   `丅丅丅` char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 SHOW CREATE TABLE `龡龡龡`;
 Table	Create Table
 龡龡龡	CREATE TEMPORARY TABLE `龡龡龡` (
   `丌丌丌` char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 SHOW CREATE TABLE `龢龢龢`;
 Table	Create Table
 龢龢龢	CREATE TEMPORARY TABLE `龢龢龢` (
   `丒丒丒` char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 DROP TABLE `ｱｱｱ`;
 DROP TABLE `ｲｲｲ`;
 DROP TABLE `ｳｳｳ`;
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 0e528db8c58..13958490aa7 100644
--- a/mysql-test/suite/jp/r/jp_create_tbl_utf8.result
+++ b/mysql-test/suite/jp/r/jp_create_tbl_utf8.result
@@ -97,77 +97,77 @@ SHOW CREATE TABLE `鐔縁襲鐔�`;
 Table	Create Table
 鐔縁襲鐔�	CREATE TABLE `鐔縁襲鐔�` (
   `鐔駈酋鐔�` char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SHOW CREATE TABLE `鐔駕讐鐔�`;
 Table	Create Table
 鐔駕讐鐔�	CREATE TABLE `鐔駕讐鐔�` (
   `鐔件酬鐔�` char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SHOW CREATE TABLE `鐔鰹蹴鐔�`;
 Table	Create Table
 鐔鰹蹴鐔�	CREATE TABLE `鐔鰹蹴鐔�` (
   `鐔醐集鐔�` char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SHOW CREATE TABLE `鐔器輯鐔�`;
 Table	Create Table
 鐔器輯鐔�	CREATE TEMPORARY TABLE `鐔器輯鐔�` (
   `鐔刻醜鐔�` char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SHOW CREATE TABLE `鐔居週鐔�`;
 Table	Create Table
 鐔居週鐔�	CREATE TEMPORARY TABLE `鐔居週鐔�` (
   `鐔削什鐔�` char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SHOW CREATE TABLE `���������`;
 Table	Create Table
 ���������	CREATE TABLE `���������` (
   `���������` char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SHOW CREATE TABLE `���������`;
 Table	Create Table
 ���������	CREATE TABLE `���������` (
   `���������` char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SHOW CREATE TABLE `���������`;
 Table	Create Table
 ���������	CREATE TABLE `���������` (
   `���������` char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SHOW CREATE TABLE `���������`;
 Table	Create Table
 ���������	CREATE TEMPORARY TABLE `���������` (
   `���������` char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SHOW CREATE TABLE `���������`;
 Table	Create Table
 ���������	CREATE TEMPORARY TABLE `���������` (
   `���������` char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SHOW CREATE TABLE `蘊�蘊�蘊�`;
 Table	Create Table
 蘊�蘊�蘊�	CREATE TABLE `蘊�蘊�蘊�` (
   `筝�筝�筝�` char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SHOW CREATE TABLE `蘊�蘊�蘊�`;
 Table	Create Table
 蘊�蘊�蘊�	CREATE TABLE `蘊�蘊�蘊�` (
   `筝�筝�筝�` char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SHOW CREATE TABLE `蘊�蘊�蘊�`;
 Table	Create Table
 蘊�蘊�蘊�	CREATE TABLE `蘊�蘊�蘊�` (
   `筝�筝�筝�` char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SHOW CREATE TABLE `蘊♂勝蘊�`;
 Table	Create Table
 蘊♂勝蘊�	CREATE TEMPORARY TABLE `蘊♂勝蘊�` (
   `筝�筝�筝�` char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SHOW CREATE TABLE `蘊∫匠蘊�`;
 Table	Create Table
 蘊∫匠蘊�	CREATE TEMPORARY TABLE `蘊∫匠蘊�` (
   `筝�筝�筝�` char(1) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 DROP TABLE `鐔縁襲鐔�`;
 DROP TABLE `鐔駕讐鐔�`;
 DROP TABLE `鐔鰹蹴鐔�`;
@@ -265,77 +265,77 @@ SHOW CREATE TABLE `鐔縁襲鐔�`;
 Table	Create Table
 鐔縁襲鐔�	CREATE TABLE `鐔縁襲鐔�` (
   `鐔駈酋鐔�` char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SHOW CREATE TABLE `鐔駕讐鐔�`;
 Table	Create Table
 鐔駕讐鐔�	CREATE TABLE `鐔駕讐鐔�` (
   `鐔件酬鐔�` char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SHOW CREATE TABLE `鐔鰹蹴鐔�`;
 Table	Create Table
 鐔鰹蹴鐔�	CREATE TABLE `鐔鰹蹴鐔�` (
   `鐔醐集鐔�` char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SHOW CREATE TABLE `鐔器輯鐔�`;
 Table	Create Table
 鐔器輯鐔�	CREATE TEMPORARY TABLE `鐔器輯鐔�` (
   `鐔刻醜鐔�` char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SHOW CREATE TABLE `鐔居週鐔�`;
 Table	Create Table
 鐔居週鐔�	CREATE TEMPORARY TABLE `鐔居週鐔�` (
   `鐔削什鐔�` char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SHOW CREATE TABLE `���������`;
 Table	Create Table
 ���������	CREATE TABLE `���������` (
   `���������` char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SHOW CREATE TABLE `���������`;
 Table	Create Table
 ���������	CREATE TABLE `���������` (
   `���������` char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SHOW CREATE TABLE `���������`;
 Table	Create Table
 ���������	CREATE TABLE `���������` (
   `���������` char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SHOW CREATE TABLE `���������`;
 Table	Create Table
 ���������	CREATE TEMPORARY TABLE `���������` (
   `���������` char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SHOW CREATE TABLE `���������`;
 Table	Create Table
 ���������	CREATE TEMPORARY TABLE `���������` (
   `���������` char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SHOW CREATE TABLE `蘊�蘊�蘊�`;
 Table	Create Table
 蘊�蘊�蘊�	CREATE TABLE `蘊�蘊�蘊�` (
   `筝�筝�筝�` char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SHOW CREATE TABLE `蘊�蘊�蘊�`;
 Table	Create Table
 蘊�蘊�蘊�	CREATE TABLE `蘊�蘊�蘊�` (
   `筝�筝�筝�` char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SHOW CREATE TABLE `蘊�蘊�蘊�`;
 Table	Create Table
 蘊�蘊�蘊�	CREATE TABLE `蘊�蘊�蘊�` (
   `筝�筝�筝�` char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SHOW CREATE TABLE `蘊♂勝蘊�`;
 Table	Create Table
 蘊♂勝蘊�	CREATE TEMPORARY TABLE `蘊♂勝蘊�` (
   `筝�筝�筝�` char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SHOW CREATE TABLE `蘊∫匠蘊�`;
 Table	Create Table
 蘊∫匠蘊�	CREATE TEMPORARY TABLE `蘊∫匠蘊�` (
   `筝�筝�筝�` char(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 DROP TABLE `鐔縁襲鐔�`;
 DROP TABLE `鐔駕讐鐔�`;
 DROP TABLE `鐔鰹蹴鐔�`;
@@ -433,77 +433,77 @@ SHOW CREATE TABLE `鐔縁襲鐔�`;
 Table	Create Table
 鐔縁襲鐔�	CREATE TABLE `鐔縁襲鐔�` (
   `鐔駈酋鐔�` char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SHOW CREATE TABLE `鐔駕讐鐔�`;
 Table	Create Table
 鐔駕讐鐔�	CREATE TABLE `鐔駕讐鐔�` (
   `鐔件酬鐔�` char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SHOW CREATE TABLE `鐔鰹蹴鐔�`;
 Table	Create Table
 鐔鰹蹴鐔�	CREATE TABLE `鐔鰹蹴鐔�` (
   `鐔醐集鐔�` char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SHOW CREATE TABLE `鐔器輯鐔�`;
 Table	Create Table
 鐔器輯鐔�	CREATE TEMPORARY TABLE `鐔器輯鐔�` (
   `鐔刻醜鐔�` char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SHOW CREATE TABLE `鐔居週鐔�`;
 Table	Create Table
 鐔居週鐔�	CREATE TEMPORARY TABLE `鐔居週鐔�` (
   `鐔削什鐔�` char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SHOW CREATE TABLE `���������`;
 Table	Create Table
 ���������	CREATE TABLE `���������` (
   `���������` char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SHOW CREATE TABLE `���������`;
 Table	Create Table
 ���������	CREATE TABLE `���������` (
   `���������` char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SHOW CREATE TABLE `���������`;
 Table	Create Table
 ���������	CREATE TABLE `���������` (
   `���������` char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SHOW CREATE TABLE `���������`;
 Table	Create Table
 ���������	CREATE TEMPORARY TABLE `���������` (
   `���������` char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SHOW CREATE TABLE `���������`;
 Table	Create Table
 ���������	CREATE TEMPORARY TABLE `���������` (
   `���������` char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SHOW CREATE TABLE `蘊�蘊�蘊�`;
 Table	Create Table
 蘊�蘊�蘊�	CREATE TABLE `蘊�蘊�蘊�` (
   `筝�筝�筝�` char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SHOW CREATE TABLE `蘊�蘊�蘊�`;
 Table	Create Table
 蘊�蘊�蘊�	CREATE TABLE `蘊�蘊�蘊�` (
   `筝�筝�筝�` char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SHOW CREATE TABLE `蘊�蘊�蘊�`;
 Table	Create Table
 蘊�蘊�蘊�	CREATE TABLE `蘊�蘊�蘊�` (
   `筝�筝�筝�` char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SHOW CREATE TABLE `蘊♂勝蘊�`;
 Table	Create Table
 蘊♂勝蘊�	CREATE TEMPORARY TABLE `蘊♂勝蘊�` (
   `筝�筝�筝�` char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SHOW CREATE TABLE `蘊∫匠蘊�`;
 Table	Create Table
 蘊∫匠蘊�	CREATE TEMPORARY TABLE `蘊∫匠蘊�` (
   `筝�筝�筝�` char(1) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 DROP TABLE `鐔縁襲鐔�`;
 DROP TABLE `鐔駕讐鐔�`;
 DROP TABLE `鐔鰹蹴鐔�`;
diff --git a/mysql-test/suite/jp/r/jp_enum_sjis.result b/mysql-test/suite/jp/r/jp_enum_sjis.result
index cc68c1536a0..0ea3f751333 100644
--- a/mysql-test/suite/jp/r/jp_enum_sjis.result
+++ b/mysql-test/suite/jp/r/jp_enum_sjis.result
@@ -78,55 +78,55 @@ Table	Create Table
 �s�P	CREATE TABLE `�s�P` (
   `�b�P` enum('�','�','�') DEFAULT NULL,
   KEY `�b�P` (`�b�P`)
-) ENGINE=InnoDB DEFAULT CHARSET=sjis
+) ENGINE=InnoDB DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 SHOW CREATE TABLE `�s�Q`;
 Table	Create Table
 �s�Q	CREATE TABLE `�s�Q` (
   `�b�P` enum('��','��','��') DEFAULT NULL,
   KEY `�b�P` (`�b�P`)
-) ENGINE=InnoDB DEFAULT CHARSET=sjis
+) ENGINE=InnoDB DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 SHOW CREATE TABLE `�s�R`;
 Table	Create Table
 �s�R	CREATE TABLE `�s�R` (
   `�b�P` enum('�\','�\','�\') DEFAULT NULL,
   KEY `�b�P` (`�b�P`)
-) ENGINE=InnoDB DEFAULT CHARSET=sjis
+) ENGINE=InnoDB DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 SHOW CREATE TABLE `�s�S`;
 Table	Create Table
 �s�S	CREATE TABLE `�s�S` (
   `�b�P` enum('�','�','�') DEFAULT NULL,
   KEY `�b�P` (`�b�P`)
-) ENGINE=MyISAM DEFAULT CHARSET=sjis
+) ENGINE=MyISAM DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 SHOW CREATE TABLE `�s�T`;
 Table	Create Table
 �s�T	CREATE TABLE `�s�T` (
   `�b�P` enum('��','��','��') DEFAULT NULL,
   KEY `�b�P` (`�b�P`)
-) ENGINE=MyISAM DEFAULT CHARSET=sjis
+) ENGINE=MyISAM DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 SHOW CREATE TABLE `�s�U`;
 Table	Create Table
 �s�U	CREATE TABLE `�s�U` (
   `�b�P` enum('�\','�\','�\') DEFAULT NULL,
   KEY `�b�P` (`�b�P`)
-) ENGINE=MyISAM DEFAULT CHARSET=sjis
+) ENGINE=MyISAM DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 SHOW CREATE TABLE `�s�V`;
 Table	Create Table
 �s�V	CREATE TABLE `�s�V` (
   `�b�P` enum('�','�','�') DEFAULT NULL,
   KEY `�b�P` (`�b�P`)
-) ENGINE=MEMORY DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 SHOW CREATE TABLE `�s�W`;
 Table	Create Table
 �s�W	CREATE TABLE `�s�W` (
   `�b�P` enum('��','��','��') DEFAULT NULL,
   KEY `�b�P` (`�b�P`)
-) ENGINE=MEMORY DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 SHOW CREATE TABLE `�s�X`;
 Table	Create Table
 �s�X	CREATE TABLE `�s�X` (
   `�b�P` enum('�\','�\','�\') DEFAULT NULL,
   KEY `�b�P` (`�b�P`)
-) ENGINE=MEMORY DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 DESC `�s�P`;
 Field	Type	Null	Key	Default	Extra
 �b�P	enum('�','�','�')	YES	MUL	NULL	
@@ -169,63 +169,63 @@ Table	Create Table
   `�b�Q` char(1) NOT NULL,
   `�b�P` enum('�','�','�') DEFAULT NULL,
   KEY `�b�P` (`�b�P`)
-) ENGINE=InnoDB DEFAULT CHARSET=sjis
+) ENGINE=InnoDB DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 SHOW CREATE TABLE `�s�Q`;
 Table	Create Table
 �s�Q	CREATE TABLE `�s�Q` (
   `�b�Q` char(1) NOT NULL,
   `�b�P` enum('��','��','��') DEFAULT NULL,
   KEY `�b�P` (`�b�P`)
-) ENGINE=InnoDB DEFAULT CHARSET=sjis
+) ENGINE=InnoDB DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 SHOW CREATE TABLE `�s�R`;
 Table	Create Table
 �s�R	CREATE TABLE `�s�R` (
   `�b�Q` char(1) NOT NULL,
   `�b�P` enum('�\','�\','�\') DEFAULT NULL,
   KEY `�b�P` (`�b�P`)
-) ENGINE=InnoDB DEFAULT CHARSET=sjis
+) ENGINE=InnoDB DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 SHOW CREATE TABLE `�s�S`;
 Table	Create Table
 �s�S	CREATE TABLE `�s�S` (
   `�b�Q` char(1) NOT NULL,
   `�b�P` enum('�','�','�') DEFAULT NULL,
   KEY `�b�P` (`�b�P`)
-) ENGINE=MyISAM DEFAULT CHARSET=sjis
+) ENGINE=MyISAM DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 SHOW CREATE TABLE `�s�T`;
 Table	Create Table
 �s�T	CREATE TABLE `�s�T` (
   `�b�Q` char(1) NOT NULL,
   `�b�P` enum('��','��','��') DEFAULT NULL,
   KEY `�b�P` (`�b�P`)
-) ENGINE=MyISAM DEFAULT CHARSET=sjis
+) ENGINE=MyISAM DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 SHOW CREATE TABLE `�s�U`;
 Table	Create Table
 �s�U	CREATE TABLE `�s�U` (
   `�b�Q` char(1) NOT NULL,
   `�b�P` enum('�\','�\','�\') DEFAULT NULL,
   KEY `�b�P` (`�b�P`)
-) ENGINE=MyISAM DEFAULT CHARSET=sjis
+) ENGINE=MyISAM DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 SHOW CREATE TABLE `�s�V`;
 Table	Create Table
 �s�V	CREATE TABLE `�s�V` (
   `�b�Q` char(1) NOT NULL,
   `�b�P` enum('�','�','�') DEFAULT NULL,
   KEY `�b�P` (`�b�P`)
-) ENGINE=MEMORY DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 SHOW CREATE TABLE `�s�W`;
 Table	Create Table
 �s�W	CREATE TABLE `�s�W` (
   `�b�Q` char(1) NOT NULL,
   `�b�P` enum('��','��','��') DEFAULT NULL,
   KEY `�b�P` (`�b�P`)
-) ENGINE=MEMORY DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 SHOW CREATE TABLE `�s�X`;
 Table	Create Table
 �s�X	CREATE TABLE `�s�X` (
   `�b�Q` char(1) NOT NULL,
   `�b�P` enum('�\','�\','�\') DEFAULT NULL,
   KEY `�b�P` (`�b�P`)
-) ENGINE=MEMORY DEFAULT CHARSET=sjis
+) ENGINE=MEMORY DEFAULT CHARSET=sjis COLLATE=sjis_japanese_ci
 CREATE TABLE t1(c1 enum('�S','�s')) default character set = sjis;
 INSERT INTO t1 VALUES('�S'),('�s');
 SELECT * FROM t1 WHERE c1 LIKE '�S';
diff --git a/mysql-test/suite/jp/r/jp_enum_ucs2.result b/mysql-test/suite/jp/r/jp_enum_ucs2.result
index cb0726cd623..683c0458dd8 100644
--- a/mysql-test/suite/jp/r/jp_enum_ucs2.result
+++ b/mysql-test/suite/jp/r/jp_enum_ucs2.result
@@ -78,55 +78,55 @@ Table	Create Table
 Ｔ１	CREATE TABLE `Ｔ１` (
   `Ｃ１` enum('ｱ','ｲ','ｳ') DEFAULT NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=InnoDB DEFAULT CHARSET=ucs2
+) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 SHOW CREATE TABLE `Ｔ２`;
 Table	Create Table
 Ｔ２	CREATE TABLE `Ｔ２` (
   `Ｃ１` enum('あ','い','う') DEFAULT NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=InnoDB DEFAULT CHARSET=ucs2
+) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 SHOW CREATE TABLE `Ｔ３`;
 Table	Create Table
 Ｔ３	CREATE TABLE `Ｔ３` (
   `Ｃ１` enum('龔','龖','龗') DEFAULT NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=InnoDB DEFAULT CHARSET=ucs2
+) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 SHOW CREATE TABLE `Ｔ４`;
 Table	Create Table
 Ｔ４	CREATE TABLE `Ｔ４` (
   `Ｃ１` enum('ｱ','ｲ','ｳ') DEFAULT NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=MyISAM DEFAULT CHARSET=ucs2
+) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 SHOW CREATE TABLE `Ｔ５`;
 Table	Create Table
 Ｔ５	CREATE TABLE `Ｔ５` (
   `Ｃ１` enum('あ','い','う') DEFAULT NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=MyISAM DEFAULT CHARSET=ucs2
+) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 SHOW CREATE TABLE `Ｔ６`;
 Table	Create Table
 Ｔ６	CREATE TABLE `Ｔ６` (
   `Ｃ１` enum('龔','龖','龗') DEFAULT NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=MyISAM DEFAULT CHARSET=ucs2
+) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 SHOW CREATE TABLE `Ｔ７`;
 Table	Create Table
 Ｔ７	CREATE TABLE `Ｔ７` (
   `Ｃ１` enum('ｱ','ｲ','ｳ') DEFAULT NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=MEMORY DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 SHOW CREATE TABLE `Ｔ８`;
 Table	Create Table
 Ｔ８	CREATE TABLE `Ｔ８` (
   `Ｃ１` enum('あ','い','う') DEFAULT NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=MEMORY DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 SHOW CREATE TABLE `Ｔ９`;
 Table	Create Table
 Ｔ９	CREATE TABLE `Ｔ９` (
   `Ｃ１` enum('龔','龖','龗') DEFAULT NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=MEMORY DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 DESC `Ｔ１`;
 Field	Type	Null	Key	Default	Extra
 Ｃ１	enum('ｱ','ｲ','ｳ')	YES	MUL	NULL	
@@ -169,63 +169,63 @@ Table	Create Table
   `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('ｱ','ｲ','ｳ') DEFAULT NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=InnoDB DEFAULT CHARSET=ucs2
+) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 SHOW CREATE TABLE `Ｔ２`;
 Table	Create Table
 Ｔ２	CREATE TABLE `Ｔ２` (
   `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('あ','い','う') DEFAULT NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=InnoDB DEFAULT CHARSET=ucs2
+) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 SHOW CREATE TABLE `Ｔ３`;
 Table	Create Table
 Ｔ３	CREATE TABLE `Ｔ３` (
   `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('龔','龖','龗') DEFAULT NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=InnoDB DEFAULT CHARSET=ucs2
+) ENGINE=InnoDB DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 SHOW CREATE TABLE `Ｔ４`;
 Table	Create Table
 Ｔ４	CREATE TABLE `Ｔ４` (
   `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('ｱ','ｲ','ｳ') DEFAULT NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=MyISAM DEFAULT CHARSET=ucs2
+) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 SHOW CREATE TABLE `Ｔ５`;
 Table	Create Table
 Ｔ５	CREATE TABLE `Ｔ５` (
   `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('あ','い','う') DEFAULT NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=MyISAM DEFAULT CHARSET=ucs2
+) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 SHOW CREATE TABLE `Ｔ６`;
 Table	Create Table
 Ｔ６	CREATE TABLE `Ｔ６` (
   `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('龔','龖','龗') DEFAULT NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=MyISAM DEFAULT CHARSET=ucs2
+) ENGINE=MyISAM DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 SHOW CREATE TABLE `Ｔ７`;
 Table	Create Table
 Ｔ７	CREATE TABLE `Ｔ７` (
   `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('ｱ','ｲ','ｳ') DEFAULT NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=MEMORY DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 SHOW CREATE TABLE `Ｔ８`;
 Table	Create Table
 Ｔ８	CREATE TABLE `Ｔ８` (
   `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('あ','い','う') DEFAULT NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=MEMORY DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 SHOW CREATE TABLE `Ｔ９`;
 Table	Create Table
 Ｔ９	CREATE TABLE `Ｔ９` (
   `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('龔','龖','龗') DEFAULT NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=MEMORY DEFAULT CHARSET=ucs2
+) ENGINE=MEMORY DEFAULT CHARSET=ucs2 COLLATE=ucs2_general_ci
 DESC `Ｔ１`;
 Field	Type	Null	Key	Default	Extra
 Ｃ２	char(1)	NO		NULL	
diff --git a/mysql-test/suite/jp/r/jp_enum_ujis.result b/mysql-test/suite/jp/r/jp_enum_ujis.result
index 217c7e0e655..8221c1c81bf 100644
--- a/mysql-test/suite/jp/r/jp_enum_ujis.result
+++ b/mysql-test/suite/jp/r/jp_enum_ujis.result
@@ -77,55 +77,55 @@ Table	Create Table
 Ｔ１	CREATE TABLE `Ｔ１` (
   `Ｃ１` enum('ｱ','ｲ','ｳ') DEFAULT NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=InnoDB DEFAULT CHARSET=ujis
+) ENGINE=InnoDB DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 SHOW CREATE TABLE `Ｔ２`;
 Table	Create Table
 Ｔ２	CREATE TABLE `Ｔ２` (
   `Ｃ１` enum('あ','い','う') DEFAULT NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=InnoDB DEFAULT CHARSET=ujis
+) ENGINE=InnoDB DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 SHOW CREATE TABLE `Ｔ３`;
 Table	Create Table
 Ｔ３	CREATE TABLE `Ｔ３` (
   `Ｃ１` enum('龔','龖','龗') DEFAULT NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=InnoDB DEFAULT CHARSET=ujis
+) ENGINE=InnoDB DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 SHOW CREATE TABLE `Ｔ４`;
 Table	Create Table
 Ｔ４	CREATE TABLE `Ｔ４` (
   `Ｃ１` enum('ｱ','ｲ','ｳ') DEFAULT NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=MyISAM DEFAULT CHARSET=ujis
+) ENGINE=MyISAM DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 SHOW CREATE TABLE `Ｔ５`;
 Table	Create Table
 Ｔ５	CREATE TABLE `Ｔ５` (
   `Ｃ１` enum('あ','い','う') DEFAULT NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=MyISAM DEFAULT CHARSET=ujis
+) ENGINE=MyISAM DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 SHOW CREATE TABLE `Ｔ６`;
 Table	Create Table
 Ｔ６	CREATE TABLE `Ｔ６` (
   `Ｃ１` enum('龔','龖','龗') DEFAULT NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=MyISAM DEFAULT CHARSET=ujis
+) ENGINE=MyISAM DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 SHOW CREATE TABLE `Ｔ７`;
 Table	Create Table
 Ｔ７	CREATE TABLE `Ｔ７` (
   `Ｃ１` enum('ｱ','ｲ','ｳ') DEFAULT NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=MEMORY DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 SHOW CREATE TABLE `Ｔ８`;
 Table	Create Table
 Ｔ８	CREATE TABLE `Ｔ８` (
   `Ｃ１` enum('あ','い','う') DEFAULT NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=MEMORY DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 SHOW CREATE TABLE `Ｔ９`;
 Table	Create Table
 Ｔ９	CREATE TABLE `Ｔ９` (
   `Ｃ１` enum('龔','龖','龗') DEFAULT NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=MEMORY DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 DESC `Ｔ１`;
 Field	Type	Null	Key	Default	Extra
 Ｃ１	enum('ｱ','ｲ','ｳ')	YES	MUL	NULL	
@@ -168,63 +168,63 @@ Table	Create Table
   `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('ｱ','ｲ','ｳ') DEFAULT NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=InnoDB DEFAULT CHARSET=ujis
+) ENGINE=InnoDB DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 SHOW CREATE TABLE `Ｔ２`;
 Table	Create Table
 Ｔ２	CREATE TABLE `Ｔ２` (
   `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('あ','い','う') DEFAULT NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=InnoDB DEFAULT CHARSET=ujis
+) ENGINE=InnoDB DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 SHOW CREATE TABLE `Ｔ３`;
 Table	Create Table
 Ｔ３	CREATE TABLE `Ｔ３` (
   `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('龔','龖','龗') DEFAULT NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=InnoDB DEFAULT CHARSET=ujis
+) ENGINE=InnoDB DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 SHOW CREATE TABLE `Ｔ４`;
 Table	Create Table
 Ｔ４	CREATE TABLE `Ｔ４` (
   `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('ｱ','ｲ','ｳ') DEFAULT NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=MyISAM DEFAULT CHARSET=ujis
+) ENGINE=MyISAM DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 SHOW CREATE TABLE `Ｔ５`;
 Table	Create Table
 Ｔ５	CREATE TABLE `Ｔ５` (
   `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('あ','い','う') DEFAULT NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=MyISAM DEFAULT CHARSET=ujis
+) ENGINE=MyISAM DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 SHOW CREATE TABLE `Ｔ６`;
 Table	Create Table
 Ｔ６	CREATE TABLE `Ｔ６` (
   `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('龔','龖','龗') DEFAULT NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=MyISAM DEFAULT CHARSET=ujis
+) ENGINE=MyISAM DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 SHOW CREATE TABLE `Ｔ７`;
 Table	Create Table
 Ｔ７	CREATE TABLE `Ｔ７` (
   `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('ｱ','ｲ','ｳ') DEFAULT NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=MEMORY DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 SHOW CREATE TABLE `Ｔ８`;
 Table	Create Table
 Ｔ８	CREATE TABLE `Ｔ８` (
   `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('あ','い','う') DEFAULT NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=MEMORY DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 SHOW CREATE TABLE `Ｔ９`;
 Table	Create Table
 Ｔ９	CREATE TABLE `Ｔ９` (
   `Ｃ２` char(1) NOT NULL,
   `Ｃ１` enum('龔','龖','龗') DEFAULT NULL,
   KEY `Ｃ１` (`Ｃ１`)
-) ENGINE=MEMORY DEFAULT CHARSET=ujis
+) ENGINE=MEMORY DEFAULT CHARSET=ujis COLLATE=ujis_japanese_ci
 DESC `Ｔ１`;
 Field	Type	Null	Key	Default	Extra
 Ｃ２	char(1)	NO		NULL	
diff --git a/mysql-test/suite/jp/r/jp_enum_utf8.result b/mysql-test/suite/jp/r/jp_enum_utf8.result
index f39a2a39b95..c6e3567e114 100644
--- a/mysql-test/suite/jp/r/jp_enum_utf8.result
+++ b/mysql-test/suite/jp/r/jp_enum_utf8.result
@@ -77,55 +77,55 @@ Table	Create Table
 鐚器��	CREATE TABLE `鐚器��` (
   `鐚ｏ��` enum('鐔�','鐔�','鐔�') DEFAULT NULL,
   KEY `鐚ｏ��` (`鐚ｏ��`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SHOW CREATE TABLE `鐚器��`;
 Table	Create Table
 鐚器��	CREATE TABLE `鐚器��` (
   `鐚ｏ��` enum('���','���','���') DEFAULT NULL,
   KEY `鐚ｏ��` (`鐚ｏ��`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SHOW CREATE TABLE `鐚器��`;
 Table	Create Table
 鐚器��	CREATE TABLE `鐚器��` (
   `鐚ｏ��` enum('蘊�','蘊�','蘊�') DEFAULT NULL,
   KEY `鐚ｏ��` (`鐚ｏ��`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SHOW CREATE TABLE `鐚器��`;
 Table	Create Table
 鐚器��	CREATE TABLE `鐚器��` (
   `鐚ｏ��` enum('鐔�','鐔�','鐔�') DEFAULT NULL,
   KEY `鐚ｏ��` (`鐚ｏ��`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SHOW CREATE TABLE `鐚器��`;
 Table	Create Table
 鐚器��	CREATE TABLE `鐚器��` (
   `鐚ｏ��` enum('���','���','���') DEFAULT NULL,
   KEY `鐚ｏ��` (`鐚ｏ��`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SHOW CREATE TABLE `鐚器��`;
 Table	Create Table
 鐚器��	CREATE TABLE `鐚器��` (
   `鐚ｏ��` enum('蘊�','蘊�','蘊�') DEFAULT NULL,
   KEY `鐚ｏ��` (`鐚ｏ��`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SHOW CREATE TABLE `鐚器��`;
 Table	Create Table
 鐚器��	CREATE TABLE `鐚器��` (
   `鐚ｏ��` enum('鐔�','鐔�','鐔�') DEFAULT NULL,
   KEY `鐚ｏ��` (`鐚ｏ��`)
-) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SHOW CREATE TABLE `鐚器��`;
 Table	Create Table
 鐚器��	CREATE TABLE `鐚器��` (
   `鐚ｏ��` enum('���','���','���') DEFAULT NULL,
   KEY `鐚ｏ��` (`鐚ｏ��`)
-) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SHOW CREATE TABLE `鐚器��`;
 Table	Create Table
 鐚器��	CREATE TABLE `鐚器��` (
   `鐚ｏ��` enum('蘊�','蘊�','蘊�') DEFAULT NULL,
   KEY `鐚ｏ��` (`鐚ｏ��`)
-) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 DESC `鐚器��`;
 Field	Type	Null	Key	Default	Extra
 鐚ｏ��	enum('鐔�','鐔�','鐔�')	YES	MUL	NULL	
@@ -168,63 +168,63 @@ Table	Create Table
   `鐚ｏ��` char(1) NOT NULL,
   `鐚ｏ��` enum('鐔�','鐔�','鐔�') DEFAULT NULL,
   KEY `鐚ｏ��` (`鐚ｏ��`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SHOW CREATE TABLE `鐚器��`;
 Table	Create Table
 鐚器��	CREATE TABLE `鐚器��` (
   `鐚ｏ��` char(1) NOT NULL,
   `鐚ｏ��` enum('���','���','���') DEFAULT NULL,
   KEY `鐚ｏ��` (`鐚ｏ��`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SHOW CREATE TABLE `鐚器��`;
 Table	Create Table
 鐚器��	CREATE TABLE `鐚器��` (
   `鐚ｏ��` char(1) NOT NULL,
   `鐚ｏ��` enum('蘊�','蘊�','蘊�') DEFAULT NULL,
   KEY `鐚ｏ��` (`鐚ｏ��`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SHOW CREATE TABLE `鐚器��`;
 Table	Create Table
 鐚器��	CREATE TABLE `鐚器��` (
   `鐚ｏ��` char(1) NOT NULL,
   `鐚ｏ��` enum('鐔�','鐔�','鐔�') DEFAULT NULL,
   KEY `鐚ｏ��` (`鐚ｏ��`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SHOW CREATE TABLE `鐚器��`;
 Table	Create Table
 鐚器��	CREATE TABLE `鐚器��` (
   `鐚ｏ��` char(1) NOT NULL,
   `鐚ｏ��` enum('���','���','���') DEFAULT NULL,
   KEY `鐚ｏ��` (`鐚ｏ��`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SHOW CREATE TABLE `鐚器��`;
 Table	Create Table
 鐚器��	CREATE TABLE `鐚器��` (
   `鐚ｏ��` char(1) NOT NULL,
   `鐚ｏ��` enum('蘊�','蘊�','蘊�') DEFAULT NULL,
   KEY `鐚ｏ��` (`鐚ｏ��`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SHOW CREATE TABLE `鐚器��`;
 Table	Create Table
 鐚器��	CREATE TABLE `鐚器��` (
   `鐚ｏ��` char(1) NOT NULL,
   `鐚ｏ��` enum('鐔�','鐔�','鐔�') DEFAULT NULL,
   KEY `鐚ｏ��` (`鐚ｏ��`)
-) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SHOW CREATE TABLE `鐚器��`;
 Table	Create Table
 鐚器��	CREATE TABLE `鐚器��` (
   `鐚ｏ��` char(1) NOT NULL,
   `鐚ｏ��` enum('���','���','���') DEFAULT NULL,
   KEY `鐚ｏ��` (`鐚ｏ��`)
-) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 SHOW CREATE TABLE `鐚器��`;
 Table	Create Table
 鐚器��	CREATE TABLE `鐚器��` (
   `鐚ｏ��` char(1) NOT NULL,
   `鐚ｏ��` enum('蘊�','蘊�','蘊�') DEFAULT NULL,
   KEY `鐚ｏ��` (`鐚ｏ��`)
-) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
 DESC `鐚器��`;
 Field	Type	Null	Key	Default	Extra
 鐚ｏ��	char(1)	NO		NULL