diff options
Diffstat (limited to 'mysql-test/main/union.result')
| -rw-r--r-- | mysql-test/main/union.result | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/mysql-test/main/union.result b/mysql-test/main/union.result index 52bc3ccb0dc..ea1a55464d5 100644 --- a/mysql-test/main/union.result +++ b/mysql-test/main/union.result @@ -1273,8 +1273,8 @@ c ENUM("one", "two") show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` enum('ä','ö','ü') CHARACTER SET utf8 NOT NULL DEFAULT 'ü', - `b` enum('one','two') CHARACTER SET utf8 DEFAULT NULL, + `a` enum('ä','ö','ü') CHARACTER SET utf8mb3 NOT NULL DEFAULT 'ü', + `b` enum('one','two') CHARACTER SET utf8mb3 DEFAULT NULL, `c` enum('one','two') DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 insert into t1 values ('ä', 'one', 'one'), ('ö', 'two', 'one'), ('ü', NULL, NULL); @@ -1445,9 +1445,9 @@ t2 CREATE TABLE `t2` ( `f3` binary(1) DEFAULT NULL, `f4` binary(5) DEFAULT NULL, `f5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', - `f6` varchar(1) CHARACTER SET utf8 DEFAULT NULL, + `f6` varchar(1) CHARACTER SET utf8mb3 DEFAULT NULL, `f7` text DEFAULT NULL, - `f8` mediumtext CHARACTER SET utf8 DEFAULT NULL + `f8` mediumtext CHARACTER SET utf8mb3 DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1, t2; CREATE TABLE t1 @@ -1465,10 +1465,10 @@ SELECT c_varchar, c_varchar, c_varchar, c_varchar FROM t1; SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `c_tinytext` text CHARACTER SET utf8 DEFAULT NULL, - `c_text` mediumtext CHARACTER SET utf8 DEFAULT NULL, - `c_mediumtext` longtext CHARACTER SET utf8 DEFAULT NULL, - `c_longtext` longtext CHARACTER SET utf8 DEFAULT NULL + `c_tinytext` text CHARACTER SET utf8mb3 DEFAULT NULL, + `c_text` mediumtext CHARACTER SET utf8mb3 DEFAULT NULL, + `c_mediumtext` longtext CHARACTER SET utf8mb3 DEFAULT NULL, + `c_longtext` longtext CHARACTER SET utf8mb3 DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 DROP TABLE t2; DROP TABLE t1; |