5.5.40+ merge

9 files changed, 17 insertions, 7 deletions

diff --git a/plugin/auth_socket/auth_socket.c b/plugin/auth_socket/auth_socket.c
index e2fb0b1291b..601b76b6b5c 100644
--- a/plugin/auth_socket/auth_socket.c
+++ b/plugin/auth_socket/auth_socket.c
@@ -37,7 +37,7 @@
 
 #elif defined HAVE_SOCKPEERCRED
 #define level SOL_SOCKET
-#define ucred socketpeercred
+#define ucred sockpeercred
 
 #elif defined HAVE_XUCRED
 #include <sys/un.h>
diff --git a/plugin/handler_socket/handlersocket/database.cpp b/plugin/handler_socket/handlersocket/database.cpp
index a15c18a4c70..2d9785df6e2 100644
--- a/plugin/handler_socket/handlersocket/database.cpp
+++ b/plugin/handler_socket/handlersocket/database.cpp
@@ -6,6 +6,8 @@
  * See COPYRIGHT.txt for details.
  */
 
+#include <my_config.h>
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/plugin/handler_socket/handlersocket/handlersocket.cpp b/plugin/handler_socket/handlersocket/handlersocket.cpp
index 2595d24a85c..6e4c03fcc24 100644
--- a/plugin/handler_socket/handlersocket/handlersocket.cpp
+++ b/plugin/handler_socket/handlersocket/handlersocket.cpp
@@ -6,6 +6,8 @@
  * See COPYRIGHT.txt for details.
  */
 
+#include <my_config.h>
+
 #include <memory>
 #include <string>
 #include <stdio.h>
diff --git a/plugin/handler_socket/handlersocket/hstcpsvr.cpp b/plugin/handler_socket/handlersocket/hstcpsvr.cpp
index 13df7ba0838..925020023bc 100644
--- a/plugin/handler_socket/handlersocket/hstcpsvr.cpp
+++ b/plugin/handler_socket/handlersocket/hstcpsvr.cpp
@@ -6,6 +6,8 @@
  * See COPYRIGHT.txt for details.
  */
 
+#include <my_config.h>
+
 #include <stdlib.h>
 #include <vector>
 #include <sys/types.h>
diff --git a/plugin/handler_socket/libhsclient/hstcpcli.cpp b/plugin/handler_socket/libhsclient/hstcpcli.cpp
index c0cb5fb1e97..21c964cb046 100644
--- a/plugin/handler_socket/libhsclient/hstcpcli.cpp
+++ b/plugin/handler_socket/libhsclient/hstcpcli.cpp
@@ -6,6 +6,8 @@
  * See COPYRIGHT.txt for details.
  */
 
+#include <my_config.h>
+
 #include <stdexcept>
 
 #include "hstcpcli.hpp"
diff --git a/plugin/handler_socket/libhsclient/socket.cpp b/plugin/handler_socket/libhsclient/socket.cpp
index 0c4816589fa..cf19d4bbe14 100644
--- a/plugin/handler_socket/libhsclient/socket.cpp
+++ b/plugin/handler_socket/libhsclient/socket.cpp
@@ -6,6 +6,8 @@
  * See COPYRIGHT.txt for details.
  */
 
+#include <my_config.h>
+
 #include <stdexcept>
 #include <string.h>
 #include <errno.h>
diff --git a/plugin/handler_socket/perl-Net-HandlerSocket/HandlerSocket.xs b/plugin/handler_socket/perl-Net-HandlerSocket/HandlerSocket.xs
index 04dab6d0a68..8169b3e52a9 100644
--- a/plugin/handler_socket/perl-Net-HandlerSocket/HandlerSocket.xs
+++ b/plugin/handler_socket/perl-Net-HandlerSocket/HandlerSocket.xs
@@ -6,17 +6,14 @@
  * See COPYRIGHT.txt for details.
  */
 
+#undef VERSION
+#include <config.h>
+
 #include "EXTERN.h"
 #include "perl.h"
 #include "XSUB.h"
 
 #include "ppport.h"
-
-/*
-  below we'll include (indirectly) my_global.h, which defines
-  VERSION too. Undefine our VERSION here.
-*/
-#undef VERSION
 #include "hstcpcli.hpp"
 
 #define DBG(x)
diff --git a/plugin/metadata_lock_info/metadata_lock_info.cc b/plugin/metadata_lock_info/metadata_lock_info.cc
index b45ea012617..fcfdb59da30 100644
--- a/plugin/metadata_lock_info/metadata_lock_info.cc
+++ b/plugin/metadata_lock_info/metadata_lock_info.cc
@@ -14,6 +14,7 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #define MYSQL_SERVER 1
+#include "my_config.h"
 #include "mysql_version.h"
 #include "mysql/plugin.h"
 #include "sql_class.h"
diff --git a/plugin/server_audit/server_audit.c b/plugin/server_audit/server_audit.c
index fc1dbf4dde4..7f86d3fc3c3 100644
--- a/plugin/server_audit/server_audit.c
+++ b/plugin/server_audit/server_audit.c
@@ -17,6 +17,8 @@
 #define PLUGIN_VERSION 0x101
 #define PLUGIN_STR_VERSION "1.1.7"
 
+#include <my_config.h>
+
 #include <stdio.h>
 #include <time.h>
 #include <string.h>