diff options
| author | Rucha Deodhar <rucha.deodhar@mariadb.com> | 2021-02-15 01:39:37 +0530 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2021-05-19 06:48:36 +0200 |
| commit | 2fdb556e045e9918410086eeaac5a94a4c028626 (patch) | |
| tree | 1420013b4e76b3192cb8ac33406c818d3ecfc3af /mysql-test/main/func_system.result | |
| parent | c366845a0b5c08285c958cf1500b3b7906ecf8d4 (diff) | |
| download | mariadb-git-2fdb556e045e9918410086eeaac5a94a4c028626.tar.gz | |
MDEV-8334: Rename utf8 to utf8mb3
This patch changes the main name of 3 byte character set from utf8 to
utf8mb3. New old_mode UTF8_IS_UTF8MB3 is added and set TRUE by default,
so that utf8 would mean utf8mb3. If not set, utf8 would mean utf8mb4.
Diffstat (limited to 'mysql-test/main/func_system.result')
| -rw-r--r-- | mysql-test/main/func_system.result | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/mysql-test/main/func_system.result b/mysql-test/main/func_system.result index 3720cac0b2e..6d80a439030 100644 --- a/mysql-test/main/func_system.result +++ b/mysql-test/main/func_system.result @@ -3,7 +3,7 @@ database() test select charset(database()); charset(database()) -utf8 +utf8mb3 select database() = "test"; database() = "test" 1 @@ -24,7 +24,7 @@ user() like _latin1"%@%" 1 select charset(user()); charset(user()) -utf8 +utf8mb3 select version()>="03.23.29"; version()>="03.23.29" 1 @@ -36,7 +36,7 @@ version()>=_latin1"03.23.29" 1 select charset(version()); charset(version()) -utf8 +utf8mb3 explain extended select database(), user(); id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE NULL NULL NULL NULL NULL NULL NULL NULL No tables used @@ -46,23 +46,23 @@ create table t1 (version char(60)) select database(), user(), version() as 'vers show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `database()` varchar(34) CHARACTER SET utf8 DEFAULT NULL, - `user()` varchar(384) CHARACTER SET utf8 DEFAULT NULL, + `database()` varchar(34) CHARACTER SET utf8mb3 DEFAULT NULL, + `user()` varchar(384) CHARACTER SET utf8mb3 DEFAULT NULL, `version` char(60) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; select charset(charset(_utf8'a')), charset(collation(_utf8'a')); charset(charset(_utf8'a')) charset(collation(_utf8'a')) -utf8 utf8 +utf8mb3 utf8mb3 select collation(charset(_utf8'a')), collation(collation(_utf8'a')); collation(charset(_utf8'a')) collation(collation(_utf8'a')) -utf8_general_ci utf8_general_ci +utf8mb3_general_ci utf8mb3_general_ci create table t1 select charset(_utf8'a'), collation(_utf8'a'); show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `charset(_utf8'a')` varchar(64) CHARACTER SET utf8 DEFAULT NULL, - `collation(_utf8'a')` varchar(64) CHARACTER SET utf8 DEFAULT NULL + `charset(_utf8'a')` varchar(64) CHARACTER SET utf8mb3 DEFAULT NULL, + `collation(_utf8'a')` varchar(64) CHARACTER SET utf8mb3 DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; select TRUE,FALSE,NULL; |