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/alter_table.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/alter_table.result')
| -rw-r--r-- | mysql-test/main/alter_table.result | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/mysql-test/main/alter_table.result b/mysql-test/main/alter_table.result index 48db24d24b2..a2830b95294 100644 --- a/mysql-test/main/alter_table.result +++ b/mysql-test/main/alter_table.result @@ -902,7 +902,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` text DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8 +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 drop table t1; create table t1 (a mediumtext character set latin1); alter table t1 convert to character set utf8; @@ -910,7 +910,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` longtext DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8 +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 drop table t1; End of 5.0 tests drop table if exists t1, t2, t3; @@ -1373,7 +1373,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `consultant_id` int(11) NOT NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8 +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 DROP TABLE t1; CREATE TABLE t1 ( `a` int(11) DEFAULT NULL @@ -1385,7 +1385,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `consultant_id` int(11) NOT NULL DEFAULT 2 -) ENGINE=MyISAM DEFAULT CHARSET=utf8 +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 DROP TABLE t1; CREATE TABLE t1 ( `a` int(11) DEFAULT NULL @@ -1397,7 +1397,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `consultant_id` int(11) NOT NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8 +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 DROP TABLE t1; CREATE TABLE t1 ( `a` int(11) DEFAULT NULL @@ -1410,7 +1410,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, `consultant_id` bigint(20) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8 +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3 DROP TABLE t1; # # BUG#27788685: NO WARNING WHEN TRUNCATING A STRING WITH DATA LOSS @@ -2230,7 +2230,7 @@ t1 CREATE TABLE `t1` ( `id` int(11) NOT NULL, `a` int(11) NOT NULL, `b` int(11) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=utf8 +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 DROP TABLE t1; # # MDEV-15308 |