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

Merge 3.1 into 3.2

Browse Source
This commit is contained in:
Marko Mäkelä
2021-10-05 16:59:15 +03:00
parent 2933a1ca75 33853036dd
commit 8574d0b840
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
unittest/libmariadb/misc.c
View File

@@ -1063,7 +1063,11 @@ static int test_read_timeout(MYSQL *unused __attribute__((unused)))
return OK; return OK;
} }
#if __has_feature(memory_sanitizer)
#ifndef __has_feature
# define __has_feature(x) 0
#endif
#if !__has_feature(memory_sanitizer)
#ifdef HAVE_REMOTEIO #ifdef HAVE_REMOTEIO
void *remote_plugin; void *remote_plugin;
static int test_remote1(MYSQL *mysql) static int test_remote1(MYSQL *mysql)

3
unittest/libmariadb/ps_bugs.c
View File

@@ -5407,6 +5407,9 @@ static int test_conc566(MYSQL *mysql)
check_stmt_rc(rc, stmt); check_stmt_rc(rc, stmt);
mysql_stmt_close(stmt); mysql_stmt_close(stmt);
rc= mysql_query(mysql,"drop procedure sp");
check_mysql_rc(rc, mysql);
return OK; return OK;
} }