summaryrefslogtreecommitdiff
path: root/sql-common
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2015-02-12 13:14:55 +0100
committerSergei Golubchik <serg@mariadb.org>2015-02-12 13:14:55 +0100
commit5dce6aa1fe36d315f17eb9f4a0f5be808805e94c (patch)
tree009d91ac356abbed8e8d68d4109823fa7c3f67c9 /sql-common
parented839052d74847c39484eff18652e5c6ba270266 (diff)
parent2a1be9cdf81ca77253faaf0e2dfc1dca7f7702f5 (diff)
downloadmariadb-git-5dce6aa1fe36d315f17eb9f4a0f5be808805e94c.tar.gz
Merge remote-tracking branch 'bzr/5.5' into bb-5.5-merge
Diffstat (limited to 'sql-common')
-rw-r--r--sql-common/client_plugin.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/sql-common/client_plugin.c b/sql-common/client_plugin.c
index d96f9648011..f31ddb22a6a 100644
--- a/sql-common/client_plugin.c
+++ b/sql-common/client_plugin.c
@@ -28,6 +28,11 @@
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"
#include <my_sys.h>