diff options
Diffstat (limited to 'mysql-test/main/ctype_utf8mb4_myisam.result')
| -rw-r--r-- | mysql-test/main/ctype_utf8mb4_myisam.result | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/mysql-test/main/ctype_utf8mb4_myisam.result b/mysql-test/main/ctype_utf8mb4_myisam.result index fbcc6613ebb..7e579e609b0 100644 --- a/mysql-test/main/ctype_utf8mb4_myisam.result +++ b/mysql-test/main/ctype_utf8mb4_myisam.result @@ -1814,7 +1814,7 @@ character_set_database latin1 character_set_filesystem binary character_set_results utf8mb4 character_set_server latin1 -character_set_system utf8 +character_set_system utf8mb3 SET @@character_set_server=@save_character_set_server; CREATE DATABASE crashtest DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin; USE crashtest; @@ -2031,7 +2031,7 @@ select concat(a, if(b>10, N'x', N'y')) from t1; concat(a, if(b>10, N'x', N'y')) ay select concat(a, if(b>10, N'æ', N'ß')) from t1; -ERROR HY000: Illegal mix of collations (latin1_swedish_ci,IMPLICIT) and (utf8_general_ci,COERCIBLE) for operation 'concat' +ERROR HY000: Illegal mix of collations (latin1_swedish_ci,IMPLICIT) and (utf8mb3_general_ci,COERCIBLE) for operation 'concat' drop table t1; set names utf8mb4; create table t1 (a varchar(10) character set latin1, b int) engine MyISAM; @@ -2506,7 +2506,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `u_decimal` int(11) NOT NULL, `utf8mb4_encoding` varchar(10) NOT NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci SELECT u_decimal,hex(utf8mb4_encoding),utf8mb4_encoding FROM t1; u_decimal hex(utf8mb4_encoding) utf8mb4_encoding 1114111 3F ? @@ -2539,7 +2539,7 @@ Table Create Table t2 CREATE TABLE `t2` ( `u_decimal` int(11) NOT NULL, `utf8mb3_encoding` varchar(10) NOT NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci SELECT u_decimal,hex(utf8mb3_encoding) FROM t2; u_decimal hex(utf8mb3_encoding) 1114111 3F3F3F3F @@ -2551,7 +2551,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `u_decimal` int(11) NOT NULL, `utf8mb4_encoding` varchar(10) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci SELECT u_decimal,hex(utf8mb4_encoding) FROM t1; u_decimal hex(utf8mb4_encoding) 1114111 3F @@ -2572,7 +2572,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `u_decimal` int(11) NOT NULL, `utf8mb4_encoding` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci SELECT u_decimal,hex(utf8mb4_encoding) FROM t1; u_decimal hex(utf8mb4_encoding) 1114111 3F @@ -2593,7 +2593,7 @@ Table Create Table t2 CREATE TABLE `t2` ( `u_decimal` int(11) NOT NULL, `utf8mb3_encoding` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci SELECT u_decimal,hex(utf8mb3_encoding) FROM t2; u_decimal hex(utf8mb3_encoding) 1114111 3F3F3F3F @@ -2639,7 +2639,7 @@ SHOW CREATE TABLE t3; Table Create Table t3 CREATE TEMPORARY TABLE `t3` ( `utf8mb4` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `utf8mb3` varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL, + `utf8mb3` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL, `concat(utf8mb4,utf8mb3)` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TEMPORARY TABLE t3; @@ -2659,9 +2659,9 @@ DROP TABLE t2; CREATE TABLE t1 (utf8mb4 VARCHAR(10) CHARACTER SET utf8mb4) ENGINE MyISAM; INSERT INTO t1 VALUES (x'f48fbfbf'); SELECT CONCAT(utf8mb4, _utf8 '¿') FROM t1; -ERROR HY000: Illegal mix of collations (utf8mb4_general_ci,IMPLICIT) and (utf8_general_ci,COERCIBLE) for operation 'concat' +ERROR HY000: Illegal mix of collations (utf8mb4_general_ci,IMPLICIT) and (utf8mb3_general_ci,COERCIBLE) for operation 'concat' SELECT CONCAT('a', _utf8 '¿') FROM t1; -ERROR HY000: Illegal mix of collations (utf8mb4_general_ci,COERCIBLE) and (utf8_general_ci,COERCIBLE) for operation 'concat' +ERROR HY000: Illegal mix of collations (utf8mb4_general_ci,COERCIBLE) and (utf8mb3_general_ci,COERCIBLE) for operation 'concat' DROP TABLE t1; # # End of 5.5 tests |