diff --git a/libmariadb b/libmariadb
index 544b6f1d12f..c6403c4c847 160000
--- a/libmariadb
+++ b/libmariadb
@@ -1 +1 @@
-Subproject commit 544b6f1d12f0e5b2a141129075ff2d64feb0e4c9
+Subproject commit c6403c4c847d94ed6b40d3fd128e729271867e75
diff --git a/sql-common/client_plugin.c b/sql-common/client_plugin.c
index 52e0ae03ee1..a4de02b9f41 100644
--- a/sql-common/client_plugin.c
+++ b/sql-common/client_plugin.c
@@ -28,10 +28,8 @@
   There is no reference counting and no unloading either.
 */
 
-#if _MSC_VER
 /* Silence warnings about variable 'unused' being used. */
 #define FORCE_INIT_OF_VARS 1
-#endif
 
 #include <my_global.h>
 #include "mysql.h"