diff options
Diffstat (limited to 'mysql-test/main/default.result')
| -rw-r--r-- | mysql-test/main/default.result | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/main/default.result b/mysql-test/main/default.result index ae835940af3..335f7e7d607 100644 --- a/mysql-test/main/default.result +++ b/mysql-test/main/default.result @@ -899,7 +899,7 @@ CREATE TABLE t1 (a VARCHAR(2) DEFAULT CONCAT(_utf8 0x41) NOT NULL); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` varchar(2) NOT NULL DEFAULT concat(_utf8'A') + `a` varchar(2) NOT NULL DEFAULT concat(_utf8mb3'A') ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci INSERT INTO t1 VALUES (DEFAULT); SELECT * FROM t1; @@ -910,7 +910,7 @@ CREATE TABLE t1 (a VARCHAR(2) DEFAULT CONCAT(_utf8 X'41') NOT NULL); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` varchar(2) NOT NULL DEFAULT concat(_utf8'A') + `a` varchar(2) NOT NULL DEFAULT concat(_utf8mb3'A') ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci INSERT INTO t1 VALUES (DEFAULT); SELECT * FROM t1; @@ -2230,7 +2230,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` varchar(10) DEFAULT NULL, `b` varchar(10) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT `a`, - `c` varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT convert(`a` using utf8), + `c` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT convert(`a` using utf8mb3), `d` varbinary(10) DEFAULT (cast(`a` as char charset binary)) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci INSERT INTO t1 (a) VALUES ('a'); |