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
2024-12-16 15:25:50 +01:00
parent 3794a86544 dc8bc987d4
commit 5eea40fecf
2 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
unittest/libmariadb/charset.c
View File

@@ -794,10 +794,13 @@ static int test_conc223(MYSQL *mysql)
MYSQL_ROW row; MYSQL_ROW row;
int found= 0; int found= 0;
int mdev27266= 0; int mdev27266= 0;
int unsupported[]= { int unsupported[]=
579, /* utf8mb3_general1400_as_ci added in 11.5 */ {
611, /* utf8mb4_general1400_as_ci added in 11.5 */ 309, /* utf8mb4_0900_bin added in 11.4. Is an alias for utf8mb4_bin */
0}; 579, /* utf8mb3_general1400_as_ci added in 11.5 */
611, /* utf8mb4_general1400_as_ci added in 11.5 */
0
};
SKIP_MYSQL(mysql); SKIP_MYSQL(mysql);
@@ -843,20 +846,26 @@ static int test_conc223(MYSQL *mysql)
id= atoi(row[0]); id= atoi(row[0]);
if (!mariadb_get_charset_by_nr(id)) if (!mariadb_get_charset_by_nr(id))
{ {
int j=0; int ok= 0;
found++; for (int j=0; unsupported[j]; j++)
for (j=0; unsupported[j]; j++) {
if (unsupported[j] == id) if (unsupported[j] == id)
found--; {
ok= 1;
break;
}
}
if (!ok)
{
found++;
diag("character set %d not found", id);
}
} }
} }
} }
mysql_free_result(res); mysql_free_result(res);
if (found) if (found)
{
diag("%d character sets/collations not found", found);
return FAIL; return FAIL;
}
return OK; return OK;
} }

2
unittest/libmariadb/my_test.h
View File

@@ -588,7 +588,7 @@ void get_envvars() {
if (!getenv("MYSQLTEST_VARDIR") && if (!getenv("MYSQLTEST_VARDIR") &&
!getenv("MARIADB_CC_TEST")) !getenv("MARIADB_CC_TEST"))
{ {
skip_all("Tests skipped.\nFor running unittest suite outside of MariaDB server tests,\nplease specify MARIADB_CC_TEST environment variable."); skip_all("Tests skipped.\nFor running unittest suite outside of MariaDB server tests,\nplease specify MARIADB_CC_TEST environment variable.\n");
exit(0); exit(0);
} }