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 /tests | |
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 'tests')
-rw-r--r-- | tests/mysql_client_test.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c index fc3fd2c0048..7173a473ebe 100644 --- a/tests/mysql_client_test.c +++ b/tests/mysql_client_test.c @@ -17111,9 +17111,9 @@ static void test_bug30472() /* Check that we have UTF8 on the server and on the client. */ DIE_UNLESS(strcmp(character_set_name_4, "utf8mb3") == 0); - DIE_UNLESS(strcmp(character_set_client_4, "utf8") == 0); - DIE_UNLESS(strcmp(character_set_results_4, "utf8") == 0); - DIE_UNLESS(strcmp(collation_connnection_4, "utf8_general_ci") == 0); + DIE_UNLESS(strcmp(character_set_client_4, "utf8mb3") == 0); + DIE_UNLESS(strcmp(character_set_results_4, "utf8mb3") == 0); + DIE_UNLESS(strcmp(collation_connnection_4, "utf8mb3_general_ci") == 0); /* That's it. Cleanup. */ |