Build remote_io as dynamic plugin to avoid build problems on several

machines with broken OpenSSL installation
mariadb-corporation · Mar 2, 2016 · 0a187a0 · 0a187a0
1 parent ea0f2e6
commit 0a187a0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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