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

Merge branch '3.3' into 3.4

Browse Source
This commit is contained in:
Georg Richter
2025-01-20 09:58:34 +01:00
parent 0074de2e90 53b7169315
commit ba64123b45
11 changed files with 152 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
unittest/libmariadb/charset.c
View File

@@ -547,6 +547,11 @@ static int test_bug30472(MYSQL *mysql)
diag("Test requires MySQL Server version 5.1 or above");
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. */
mysql_set_character_set(mysql, "latin1");
@@ -804,6 +809,12 @@ static int test_conc223(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;
}
/*
Test if we're running against an MDEV-27266 server.
It can be detected by the presense of the FULL_COLLATION_NAME