database/mariadb-connector-c
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-connector-c.git synced 2025-08-08 14:02:17 +03:00
Code Activity

MDEV-8334: Rename utf8 to utf8mb3

Browse Source 
This patch is made as a part of MDEV-8334 to fix failing test in unit and
main test suite so that utf8mb3 characterset is recognized. Failing tests:
main.mysql_client_test
main.mysql_client_test_comp
unit.conc_basic-t
unit.conc_charset
unit.conc_connection
This commit is contained in:
Rucha Deodhar
2021-03-26 00:55:56 +05:30
parent e9a2c9eccc
commit 2f7230c62b
5 changed files with 32 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
unittest/libmariadb/connection.c
View File

@@ -640,13 +640,12 @@ int test_conc21(MYSQL *mysql)
int test_conc26(MYSQL *unused __attribute__((unused)))
{
MYSQL *mysql= mysql_init(NULL);
mysql_options(mysql, MYSQL_SET_CHARSET_NAME, "utf8");
mysql_options(mysql, MYSQL_SET_CHARSET_NAME, "ascii");
FAIL_IF(my_test_connect(mysql, hostname, "notexistinguser", "password", schema, port, NULL, CLIENT_REMEMBER_OPTIONS),
"Error expected");
FAIL_IF(!mysql->options.charset_name || strcmp(mysql->options.charset_name, "utf8") != 0,
"expected charsetname=utf8");
FAIL_IF(!mysql->options.charset_name || strcmp(mysql->options.charset_name, "ascii") != 0,
"expected charsetname=ascii");
mysql_close(mysql);
mysql= mysql_init(NULL);
@@ -974,14 +973,15 @@ static int test_sess_track_db(MYSQL *mysql)
if (mysql_get_server_version(mysql) >= 100300)
{
diag("charset: %s", mysql->charset->csname);
rc= mysql_query(mysql, "SET NAMES utf8");
rc= mysql_query(mysql, "SET NAMES ascii");
check_mysql_rc(rc, mysql);
if (!mysql_session_track_get_first(mysql, SESSION_TRACK_SYSTEM_VARIABLES, &data, &len))
do {
printf("# SESSION_TRACK_VARIABLES: %*.*s\n", (int)len, (int)len, data);
} while (!mysql_session_track_get_next(mysql, SESSION_TRACK_SYSTEM_VARIABLES, &data, &len));
diag("charset: %s", mysql->charset->csname);
FAIL_IF(strcmp(mysql->charset->csname, "utf8"), "Expected charset 'utf8'");
FAIL_IF(strcmp(mysql->charset->csname, "ascii"),
"Expected charset 'ascii'");
rc= mysql_query(mysql, "SET NAMES latin1");
check_mysql_rc(rc, mysql);