From 0a187a0c3b20407d13fff820a1e4bb02490c1256 Mon Sep 17 00:00:00 2001
From: Georg Richter <georg@mariadb.com>
Date: Wed, 2 Mar 2016 16:43:39 +0100
Subject: [PATCH] Build remote_io as dynamic plugin to avoid build problems on
 several machines with broken OpenSSL installation

---
 cmake/plugins.cmake           | 2 +-
 unittest/libmariadb/my_test.h | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/cmake/plugins.cmake b/cmake/plugins.cmake
index 96ed0296..e539fddb 100644
--- a/cmake/plugins.cmake
+++ b/cmake/plugins.cmake
@@ -50,7 +50,7 @@ IF(CURL_FOUND)
   IF(WIN32)
     REGISTER_PLUGIN("REMOTEIO" "${CMAKE_SOURCE_DIR}/plugins/io/remote_io.c" "remote_io_plugin" "DYNAMIC" "remote_io" 1)
   ELSE()
-    REGISTER_PLUGIN("REMOTEIO" "${CMAKE_SOURCE_DIR}/plugins/io/remote_io.c" "remote_io_plugin" "STATIC" "remote_io" 1)
+    REGISTER_PLUGIN("REMOTEIO" "${CMAKE_SOURCE_DIR}/plugins/io/remote_io.c" "remote_io_plugin" "DYNAMIC" "remote_io" 1)
   ENDIF()
 ENDIF()
 
diff --git a/unittest/libmariadb/my_test.h b/unittest/libmariadb/my_test.h
index 0c7cf366..c1acf256 100644
--- a/unittest/libmariadb/my_test.h
+++ b/unittest/libmariadb/my_test.h
@@ -27,6 +27,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <tap.h>
 #include "ma_getopt.h"
 #include <memory.h>
+#include <string.h>
 #include <ma_errmsg.h>
 
 #ifndef WIN32