diff options
Diffstat (limited to 'mysql-test/main/func_hybrid_type.result')
-rw-r--r-- | mysql-test/main/func_hybrid_type.result | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/mysql-test/main/func_hybrid_type.result b/mysql-test/main/func_hybrid_type.result index 9800299020f..54273452965 100644 --- a/mysql-test/main/func_hybrid_type.result +++ b/mysql-test/main/func_hybrid_type.result @@ -3145,8 +3145,8 @@ FROM t1; SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `c1` varchar(1) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL, - `c2` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL + `c1` varchar(1) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, + `c2` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT MAX(COALESCE(c1)) AS c1, @@ -3196,9 +3196,9 @@ FROM t1; SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `c1` varchar(1) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL, - `c2` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL, - `c3` text CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL + `c1` varchar(1) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, + `c2` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, + `c3` text CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT MAX(COALESCE(c1)) AS c1, @@ -3240,7 +3240,7 @@ FROM t1; SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `c1` varchar(1) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL + `c1` varchar(1) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT MAX(COALESCE(c1)) AS c1 @@ -3315,8 +3315,8 @@ FROM t1; SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `c1` varchar(1) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL, - `c2` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL + `c1` varchar(1) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, + `c2` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT @c1:=c1 AS c1, @@ -3364,9 +3364,9 @@ FROM t1; SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `c1` varchar(1) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL, - `c2` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL, - `c3` text CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL + `c1` varchar(1) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, + `c2` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, + `c3` text CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT @c:=c1 AS c1, @@ -3406,7 +3406,7 @@ FROM t1; SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `c1` varchar(1) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL + `c1` varchar(1) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT @c:=c1 AS c1 @@ -3492,8 +3492,8 @@ COALESCE(_latin1'aaa',_utf8 0xC39F) AS c2; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varchar(3) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL, - `c2` varchar(3) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL + `c1` varchar(3) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL, + `c2` varchar(3) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SELECT * FROM t1; c1 c2 |