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/suite/innodb/r/innodb.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/suite/innodb/r/innodb.result')
| -rw-r--r-- | mysql-test/suite/innodb/r/innodb.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/suite/innodb/r/innodb.result b/mysql-test/suite/innodb/r/innodb.result index 2f5b52bf874..7cb8602412a 100644 --- a/mysql-test/suite/innodb/r/innodb.result +++ b/mysql-test/suite/innodb/r/innodb.result @@ -2264,7 +2264,7 @@ create table t1 (v char(10) character set utf8); show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `v` char(10) CHARACTER SET utf8 DEFAULT NULL + `v` char(10) CHARACTER SET utf8mb3 DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 drop table t1; create table t1 (v varchar(10), c char(10)) row_format=fixed; @@ -2317,7 +2317,7 @@ Note 1246 Converting column 'v' from VARCHAR to TEXT show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `v` mediumtext CHARACTER SET utf8 DEFAULT NULL + `v` mediumtext CHARACTER SET utf8mb3 DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 drop table t1; SET sql_mode = default; |