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/constraints.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/constraints.result')
| -rw-r--r-- | mysql-test/main/constraints.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/main/constraints.result b/mysql-test/main/constraints.result index 24f8417d313..3702bff83ec 100644 --- a/mysql-test/main/constraints.result +++ b/mysql-test/main/constraints.result @@ -99,7 +99,7 @@ long_enough_name CREATE TABLE `long_enough_name` ( `f2` int(11) NOT NULL, `f3` int(11) DEFAULT NULL, `f4` timestamp NOT NULL DEFAULT current_timestamp(), - `f5` varchar(32) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT 'foo', + `f5` varchar(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin NOT NULL DEFAULT 'foo', `f6` smallint(6) NOT NULL DEFAULT 1, `f7` int(11) DEFAULT NULL, PRIMARY KEY (`pk`), |