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.1' into 3.2

Browse Source
This commit is contained in:
Georg Richter
2021-07-26 18:05:17 +02:00
parent 1f320a663c 9c651bd678
commit 61a2ae2705
3 changed files with 63 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
unittest/libmariadb/misc.c
View File

@@ -846,7 +846,10 @@ static int test_conc49(MYSQL *mysql)
check_mysql_rc(rc, mysql);
res= mysql_store_result(mysql);
row= mysql_fetch_row(res);
if (atol(row[0]) == 0) {
i= !atol(row[0]);
mysql_free_result(res);
if (i) {
diag("Load local infile disable");
mysql_free_result(res);
return SKIP;
@@ -1069,6 +1072,7 @@ static int test_remote1(MYSQL *mysql)
int rc;
MYSQL_RES *res;
MYSQL_ROW row;
SKIP_SKYSQL;
SKIP_SKYSQL;