diff --git a/cmake/plugins.cmake b/cmake/plugins.cmake
index 2068b1e3..6d5d0c0f 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/include/mysql.h b/include/mysql.h
index 78e7911e..270567f5 100644
--- a/include/mysql.h
+++ b/include/mysql.h
@@ -126,9 +126,6 @@ extern unsigned int mariadb_deinitialize_ssl;
   typedef unsigned long long my_ulonglong;
 #endif
 
-/* mysql compatibility macro */
-#define mysql_options4(A,B,C,D) mysql_optionsv((A),(B),(C),(D))
-
 #define SET_CLIENT_ERROR(a, b, c, d) \
   { \
     (a)->net.last_errno= (b);\
@@ -487,6 +484,8 @@ MYSQL_RES *	STDCALL mysql_store_result(MYSQL *mysql);
 MYSQL_RES *	STDCALL mysql_use_result(MYSQL *mysql);
 int		STDCALL mysql_options(MYSQL *mysql,enum mysql_option option,
 				      const void *arg);
+int		STDCALL mysql_options4(MYSQL *mysql,enum mysql_option option,
+				      const void *arg1, const void *arg2);
 void		STDCALL mysql_free_result(MYSQL_RES *result);
 void		STDCALL mysql_data_seek(MYSQL_RES *result,
 					my_ulonglong offset);
diff --git a/libmariadb/CMakeLists.txt b/libmariadb/CMakeLists.txt
index a0df989d..8dbc61f1 100644
--- a/libmariadb/CMakeLists.txt
+++ b/libmariadb/CMakeLists.txt
@@ -121,6 +121,7 @@ SET(EXPORT_SYMBOLS
  mysql_num_fields
  mysql_num_rows
  mysql_options
+ mysql_options4
  mysql_optionsv
  mysql_ping
  mysql_ping_cont
@@ -305,10 +306,8 @@ my_malloc.c
 my_messnc.c
 my_net.c
 my_once.c
-my_open.c
 my_port.c 
 my_pthread.c
-my_read.c
 my_realloc.c
 my_seek.c
 my_static.c
diff --git a/libmariadb/libmariadb.c b/libmariadb/libmariadb.c
index 2ace684d..49f136a3 100644
--- a/libmariadb/libmariadb.c
+++ b/libmariadb/libmariadb.c
@@ -3258,6 +3258,11 @@ mysql_options(MYSQL *mysql,enum mysql_option option, const void *arg)
   return mysql_optionsv(mysql, option, arg);
 }
 
+int STDCALL
+mysql_options4(MYSQL *mysql,enum mysql_option option, const void *arg1, const void *arg2)
+{
+  return mysql_optionsv(mysql, option, arg1, arg2);
+}
 /****************************************************************************
 ** Functions to get information from the MySQL structure
 ** These are functions to make shared libraries more usable.