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

Test fix for charsets

Browse Source 
Skipped 2 tests if running against MariaDB 11.4 or newer version.
This commit is contained in:
Georg Richter
2024-12-20 14:35:37 +01:00
parent 5485acd470
commit 80a7fa5cee
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
unittest/libmariadb/charset.c
View File

@@ -542,6 +542,11 @@ static int test_bug30472(MYSQL *mysql)
diag("Test requires MySQL Server version 5.1 or above"); diag("Test requires MySQL Server version 5.1 or above");
return SKIP; return SKIP;
} }
if (mariadb_connection(mysql) && mysql_get_server_version(mysql) >= 110400)
{
diag("C/C 3.3 doesn't support all collations from 11.4 and above");
return SKIP;
}
/* Retrieve character set information. */ /* Retrieve character set information. */
mysql_set_character_set(mysql, "latin1"); mysql_set_character_set(mysql, "latin1");
@@ -796,7 +801,11 @@ static int test_conc223(MYSQL *mysql)
int found= 0; int found= 0;
SKIP_MYSQL(mysql); SKIP_MYSQL(mysql);
if (mariadb_connection(mysql) && mysql_get_server_version(mysql) >= 110400)
{
diag("C/C 3.3 doesn't support all collations from 11.4 and above");
return SKIP;
}
rc= mysql_query(mysql, "SELECT ID, CHARACTER_SET_NAME, COLLATION_NAME FROM INFORMATION_SCHEMA.COLLATIONS"); rc= mysql_query(mysql, "SELECT ID, CHARACTER_SET_NAME, COLLATION_NAME FROM INFORMATION_SCHEMA.COLLATIONS");
check_mysql_rc(rc, mysql); check_mysql_rc(rc, mysql);