1 files changed, 18 insertions, 18 deletions

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';