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/query_cache_ps_no_prot.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/query_cache_ps_no_prot.result')
| -rw-r--r-- | mysql-test/main/query_cache_ps_no_prot.result | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mysql-test/main/query_cache_ps_no_prot.result b/mysql-test/main/query_cache_ps_no_prot.result index ef1f92b597d..94986da49f0 100644 --- a/mysql-test/main/query_cache_ps_no_prot.result +++ b/mysql-test/main/query_cache_ps_no_prot.result @@ -408,9 +408,9 @@ EXECUTE stmt_a_2; SELECT * FROM mysqltest1.t1; msg mysqltest1 -utf8_unicode_ci +utf8mb3_unicode_ci mysqltest1 -utf8_unicode_ci +utf8mb3_unicode_ci SELECT * FROM mysqltest2.t1; msg @@ -484,7 +484,7 @@ NULL latin1_swedish_ci EXECUTE stmt_c_1; DATABASE() @@collation_database -mysqltest1 utf8_unicode_ci +mysqltest1 utf8mb3_unicode_ci SELECT DATABASE(), @@collation_database; DATABASE() @@collation_database @@ -516,7 +516,7 @@ Note 1049 Unknown database 'mysqltest2' SELECT DATABASE(), @@collation_database; DATABASE() @@collation_database -mysqltest1 utf8_unicode_ci +mysqltest1 utf8mb3_unicode_ci EXECUTE stmt_c_3; DATABASE() @@collation_database @@ -524,7 +524,7 @@ NULL latin1_swedish_ci SELECT DATABASE(), @@collation_database; DATABASE() @@collation_database -mysqltest1 utf8_unicode_ci +mysqltest1 utf8mb3_unicode_ci DROP DATABASE mysqltest1; |