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/funcs_1/r/is_tables.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/funcs_1/r/is_tables.result')
| -rw-r--r-- | mysql-test/suite/funcs_1/r/is_tables.result | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/suite/funcs_1/r/is_tables.result b/mysql-test/suite/funcs_1/r/is_tables.result index 739d00eacb9..54c75efd74e 100644 --- a/mysql-test/suite/funcs_1/r/is_tables.result +++ b/mysql-test/suite/funcs_1/r/is_tables.result @@ -77,7 +77,7 @@ TABLES CREATE TEMPORARY TABLE `TABLES` ( `TABLE_COMMENT` varchar(2048) NOT NULL DEFAULT '', `MAX_INDEX_LENGTH` bigint(21) unsigned DEFAULT NULL, `TEMPORARY` varchar(1) DEFAULT NULL -) ENGINE=MEMORY DEFAULT CHARSET=utf8 +) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 SHOW COLUMNS FROM information_schema.TABLES; Field Type Null Key Default Extra TABLE_CATALOG varchar(512) NO @@ -268,11 +268,11 @@ ALTER TABLE db_datadict.t1_my_tablex DEFAULT CHARACTER SET utf8; SELECT table_name, table_collation FROM information_schema.tables WHERE table_name = 't1_my_tablex'; table_name table_collation -t1_my_tablex utf8_general_ci +t1_my_tablex utf8mb3_general_ci SELECT table_name, table_collation FROM information_schema.tables WHERE table_name = 't1_my_tablex'; table_name table_collation -t1_my_tablex utf8_general_ci +t1_my_tablex utf8mb3_general_ci ALTER TABLE db_datadict.t1_my_tablex DEFAULT CHARACTER SET latin1 COLLATE latin1_german1_ci; SELECT table_name, table_collation FROM information_schema.tables |