diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-21 11:45:00 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-21 11:45:00 +0300 |
| commit | 4930f9c94bb610f4d76b73a8b6b351d9fa9c5d68 (patch) | |
| tree | ed6b2754116233ca8a39515c7ba06e09b2a8cdc8 /tests | |
| parent | 502b769561760f35d2b612ab984906c8a4bb9b51 (diff) | |
| parent | d104fe6f734df2aebe24b3e5e3dbc189a5302920 (diff) | |
| download | mariadb-git-4930f9c94bb610f4d76b73a8b6b351d9fa9c5d68.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/mysql_client_test.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c index 0a2d16599ae..fc3fd2c0048 100644 --- a/tests/mysql_client_test.c +++ b/tests/mysql_client_test.c @@ -1,5 +1,5 @@ /* Copyright (c) 2002, 2014, Oracle and/or its affiliates. - Copyright (c) 2008, 2020, MariaDB + Copyright (c) 2008, 2021, MariaDB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -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,7 +17110,7 @@ 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_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); |