From f4772150d260a8919a9e8ba1961e0e8026f5d89d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Tue, 5 Oct 2021 16:48:07 +0300 Subject: [PATCH 1/2] CONC-566 fixup: unit test cleanup --- unittest/libmariadb/ps_bugs.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/unittest/libmariadb/ps_bugs.c b/unittest/libmariadb/ps_bugs.c index 4d13db14..24679bf6 100644 --- a/unittest/libmariadb/ps_bugs.c +++ b/unittest/libmariadb/ps_bugs.c @@ -5342,6 +5342,9 @@ static int test_conc566(MYSQL *mysql) check_stmt_rc(rc, stmt); mysql_stmt_close(stmt); + + rc= mysql_query(mysql,"drop procedure sp"); + check_mysql_rc(rc, mysql); return OK; } From 33853036dd2793ecdf36a2b6978c5d114ddd76c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Tue, 5 Oct 2021 16:48:31 +0300 Subject: [PATCH 2/2] fixup 9c0250547406a6be3aee076cf0c0ba9630850a9e: build failure outside clang --- unittest/libmariadb/misc.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/unittest/libmariadb/misc.c b/unittest/libmariadb/misc.c index ff87866e..3e5151a3 100644 --- a/unittest/libmariadb/misc.c +++ b/unittest/libmariadb/misc.c @@ -1060,7 +1060,11 @@ static int test_read_timeout(MYSQL *unused __attribute__((unused))) return OK; } -#if __has_feature(memory_sanitizer) + +#ifndef __has_feature +# define __has_feature(x) 0 +#endif +#if !__has_feature(memory_sanitizer) #ifdef HAVE_REMOTEIO void *remote_plugin; static int test_remote1(MYSQL *mysql)