From 80a7fa5cee309dd194d13f3a1d6633b0ccd795a6 Mon Sep 17 00:00:00 2001 From: Georg Richter Date: Fri, 20 Dec 2024 14:35:37 +0100 Subject: [PATCH] Test fix for charsets Skipped 2 tests if running against MariaDB 11.4 or newer version. --- unittest/libmariadb/charset.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/unittest/libmariadb/charset.c b/unittest/libmariadb/charset.c index 6c432749..3579c55d 100644 --- a/unittest/libmariadb/charset.c +++ b/unittest/libmariadb/charset.c @@ -542,6 +542,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"); @@ -796,7 +801,11 @@ static int test_conc223(MYSQL *mysql) int found= 0; 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"); check_mysql_rc(rc, mysql);