Fix for CONC-101: redefinition of dlerror

holzboote@googlemail.com · holzboote@googlemail.com · commit fc5859154ee3 · 2014-07-14T11:50:16.000+02:00
diff --git a/include/my_global.h b/include/my_global.h
@@ -1081,7 +1081,7 @@ do { doubleget_union _tmp; \
 #elif defined(HAVE_DLFCN_H)
 #include <dlfcn.h>
 #endif
-#if HAVE_DLERROR
+#ifndef HAVE_DLERROR
 #define dlerror() ""
 #endif
 #endif
diff --git a/unittest/libmariadb/misc.c b/unittest/libmariadb/misc.c
@@ -935,7 +935,6 @@ static int test_connect_attrs(MYSQL *my)
 
   if (!(mysql->server_capabilities & CLIENT_CONNECT_ATTRS))
   {
-    mysql_close(mysql);
     diag("Server doesn't support connection attributes");
     return SKIP;
   }
@@ -956,7 +955,6 @@ static int test_connect_attrs(MYSQL *my)
 
   len= mysql->options.extension->connect_attrs_len;
 
-
   mysql_close(mysql);
 
   FAIL_IF(rc < 3, "Expected 3 or more rows");

Original file line number	Diff line number	Diff line change
`@@ -935,7 +935,6 @@ static int test_connect_attrs(MYSQL *my)`
`935`	`935`
`936`	`936`	`if (!(mysql->server_capabilities & CLIENT_CONNECT_ATTRS))`
`937`	`937`	`{`
`938`		`- mysql_close(mysql);`
`939`	`938`	`diag("Server doesn't support connection attributes");`
`940`	`939`	`return SKIP;`
`941`	`940`	`}`
`@@ -956,7 +955,6 @@ static int test_connect_attrs(MYSQL *my)`
`956`	`955`
`957`	`956`	`len= mysql->options.extension->connect_attrs_len;`
`958`	`957`
`959`		`-`
`960`	`958`	`mysql_close(mysql);`
`961`	`959`
`962`	`960`	`FAIL_IF(rc < 3, "Expected 3 or more rows");`