diff options
Diffstat (limited to 'mysql-test/main/ctype_mb.result')
| -rw-r--r-- | mysql-test/main/ctype_mb.result | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/mysql-test/main/ctype_mb.result b/mysql-test/main/ctype_mb.result index 015457cc1b3..4d33ac1d056 100644 --- a/mysql-test/main/ctype_mb.result +++ b/mysql-test/main/ctype_mb.result @@ -3,18 +3,18 @@ CREATE TABLE t1 SELECT _utf8'test' as c1, _utf8'ัะตัั' as c2; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varchar(4) CHARACTER SET utf8 NOT NULL, - `c2` varchar(4) CHARACTER SET utf8 NOT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 + `c1` varchar(4) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL, + `c2` varchar(4) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DELETE FROM t1; ALTER TABLE t1 ADD c3 CHAR(4) CHARACTER SET utf8; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varchar(4) CHARACTER SET utf8 NOT NULL, - `c2` varchar(4) CHARACTER SET utf8 NOT NULL, - `c3` char(4) CHARACTER SET utf8 DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 + `c1` varchar(4) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL, + `c2` varchar(4) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL, + `c3` char(4) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci INSERT IGNORE INTO t1 VALUES ('aaaabbbbccccdddd','aaaabbbbccccdddd','aaaabbbbccccdddd'); Warnings: Warning 1265 Data truncated for column 'c1' at row 1 @@ -28,9 +28,9 @@ CREATE TABLE t1 (a CHAR(4) CHARACTER SET utf8, KEY key_a(a(3))); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` char(4) CHARACTER SET utf8 DEFAULT NULL, + `a` char(4) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL, KEY `key_a` (`a`(3)) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SHOW KEYS FROM t1; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment t1 1 key_a 1 a A NULL 3 NULL YES BTREE @@ -40,7 +40,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` char(4) DEFAULT NULL, KEY `key_a` (`a`(3)) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SHOW KEYS FROM t1; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment t1 1 key_a 1 a A NULL 3 NULL YES BTREE @@ -48,9 +48,9 @@ ALTER TABLE t1 CHANGE a a CHAR(4) CHARACTER SET utf8; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` char(4) CHARACTER SET utf8 DEFAULT NULL, + `a` char(4) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL, KEY `key_a` (`a`(3)) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SHOW KEYS FROM t1; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment t1 1 key_a 1 a A NULL 3 NULL YES BTREE |