diff options
| author | Rucha Deodhar <rucha.deodhar@mariadb.com> | 2021-02-15 01:39:37 +0530 |
|---|---|---|
| committer | Rucha Deodhar <rucha.deodhar@mariadb.com> | 2021-04-20 12:50:32 +0530 |
| commit | e7762b3a725d0608f63a4c9bfb4e1db87cf20fe7 (patch) | |
| tree | 3e3aed3cd181ea2ed30903d47a99e7cf8d3a8dd0 /tests/mysql_client_test.c | |
| parent | bfedf1eb4b63235e7dd88f36305758f52f28f27d (diff) | |
| download | mariadb-git-bb-10.6-MDEV-8334.tar.gz | |
MDEV-8334: Rename utf8 to utf8mb3bb-10.6-MDEV-8334
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/mysql_client_test.c')
| -rw-r--r-- | tests/mysql_client_test.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c index 0a2d16599ae..ed61aca7346 100644 --- a/tests/mysql_client_test.c +++ b/tests/mysql_client_test.c @@ -14328,8 +14328,8 @@ static void test_client_character_set() DIE_UNLESS(rc == 0); mysql_get_character_set_info(mysql, &cs); - DIE_UNLESS(!strcmp(cs.csname, "utf8")); - DIE_UNLESS(!strcmp(cs.name, "utf8_general_ci")); + DIE_UNLESS(!strcmp(cs.csname, "utf8mb3")); + DIE_UNLESS(!strcmp(cs.name, "utf8mb3_general_ci")); /* Restore the default character set */ rc= mysql_set_character_set(mysql, csdefault); myquery(rc); @@ -17110,10 +17110,10 @@ static void test_bug30472() /* Check that we have UTF8 on the server and on the client. */ - DIE_UNLESS(strcmp(character_set_name_4, "utf8") == 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_name_4, "utf8mb3") == 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. */ |