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

Fix for CONC-101: redefinition of dlerror

Browse Source
This commit is contained in:
holzboote@googlemail.com
2014-07-14 11:50:16 +02:00
parent 07d26ed662
commit fc5859154e
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/my_global.h
View File

@@ -1081,7 +1081,7 @@ do { doubleget_union _tmp; \
#elif defined(HAVE_DLFCN_H) #elif defined(HAVE_DLFCN_H)
#include <dlfcn.h> #include <dlfcn.h>
#endif #endif
#if HAVE_DLERROR #ifndef HAVE_DLERROR
#define dlerror() "" #define dlerror() ""
#endif #endif
#endif #endif

2
unittest/libmariadb/misc.c
View File

@@ -935,7 +935,6 @@ static int test_connect_attrs(MYSQL *my)
if (!(mysql->server_capabilities & CLIENT_CONNECT_ATTRS)) if (!(mysql->server_capabilities & CLIENT_CONNECT_ATTRS))
{ {
mysql_close(mysql);
diag("Server doesn't support connection attributes"); diag("Server doesn't support connection attributes");
return SKIP; return SKIP;
} }
@@ -956,7 +955,6 @@ static int test_connect_attrs(MYSQL *my)
len= mysql->options.extension->connect_attrs_len; len= mysql->options.extension->connect_attrs_len;
mysql_close(mysql); mysql_close(mysql);
FAIL_IF(rc < 3, "Expected 3 or more rows"); FAIL_IF(rc < 3, "Expected 3 or more rows");