diff options
Diffstat (limited to 'mysql-test/main/create.result')
| -rw-r--r-- | mysql-test/main/create.result | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/mysql-test/main/create.result b/mysql-test/main/create.result index 49e60dd9bcc..9ab1db89029 100644 --- a/mysql-test/main/create.result +++ b/mysql-test/main/create.result @@ -721,7 +721,7 @@ primary key (a) show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` varchar(112) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL, + `a` varchar(112) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin NOT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table t1; @@ -736,7 +736,7 @@ b int not null, primary key (a) show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` varchar(12) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL, + `a` varchar(12) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin NOT NULL, `b` int(11) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci @@ -752,7 +752,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `b` int(11) NOT NULL, - `a` varchar(12) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL, + `a` varchar(12) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin NOT NULL, `c` int(1) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci @@ -765,7 +765,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `b` int(11) DEFAULT NULL, - `a` varchar(12) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL, + `a` varchar(12) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin NOT NULL, `c` int(1) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci @@ -777,7 +777,7 @@ b int not null, primary key (a) show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` varchar(12) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL, + `a` varchar(12) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin NOT NULL, `b` int(11) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci @@ -789,7 +789,7 @@ b int not null, primary key (a) show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` varchar(12) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL, + `a` varchar(12) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin NOT NULL, `b` int(11) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci @@ -980,13 +980,13 @@ CREATE TABLE t1(c1 VARCHAR(33), KEY (c1) USING BTREE); DROP TABLE t1; CREATE TABLE t1(c1 VARCHAR(33), KEY USING BTREE (c1) USING HASH) ENGINE=MEMORY; SHOW INDEX 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 c1 1 c1 NULL 0 NULL NULL YES HASH +Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment Ignored +t1 1 c1 1 c1 NULL 0 NULL NULL YES HASH NO DROP TABLE t1; CREATE TABLE t1(c1 VARCHAR(33), KEY USING HASH (c1) USING BTREE) ENGINE=MEMORY; SHOW INDEX 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 c1 1 c1 A NULL NULL NULL YES BTREE +Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment Ignored +t1 1 c1 1 c1 A NULL NULL NULL YES BTREE NO DROP TABLE t1; create user mysqltest_1@'test@test'; ERROR HY000: Malformed hostname (illegal symbol: '@') @@ -1089,7 +1089,7 @@ t1 CREATE TABLE `t1` ( `QUERY_ID` bigint(4) NOT NULL, `INFO_BINARY` blob, `TID` bigint(4) NOT NULL -) DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci +) DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci drop table t1; create temporary table t1 like information_schema.processlist; show create table t1; @@ -1113,7 +1113,7 @@ t1 CREATE TEMPORARY TABLE `t1` ( `QUERY_ID` bigint(4) NOT NULL, `INFO_BINARY` blob, `TID` bigint(4) NOT NULL -) DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci +) DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci drop table t1; create table t1 like information_schema.character_sets; show create table t1; @@ -1123,7 +1123,7 @@ t1 CREATE TABLE `t1` ( `DEFAULT_COLLATE_NAME` varchar(32) NOT NULL, `DESCRIPTION` varchar(60) NOT NULL, `MAXLEN` bigint(3) NOT NULL -) ENGINE=MEMORY DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci +) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci drop table t1; # -- |