diff --git a/include/my_global.h b/include/my_global.h
index 296e94a7..5f2f0284 100644
--- 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
index 18f33b27..f649d37b 100644
--- 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");