diff options
| author | Michael Widenius <monty@mariadb.org> | 2017-06-18 06:42:16 +0300 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-08-24 01:05:44 +0200 |
| commit | 4aaa38d26ed95127b8424100c8a14c77af15fc11 (patch) | |
| tree | fd96b83db1e58971f25b7a27239b07cdca0f0793 /plugin/handler_socket/libhsclient | |
| parent | b0da8897b08b0717ccae418f880b5ab0f5960312 (diff) | |
| download | mariadb-git-4aaa38d26ed95127b8424100c8a14c77af15fc11.tar.gz | |
Enusure that my_global.h is included first
- Added sql/mariadb.h file that should be included first by files in sql
directory, if sql_plugin.h is not used (sql_plugin.h adds SHOW variables
that must be done before my_global.h is included)
- Removed a lot of include my_global.h from include files
- Removed include's of some files that my_global.h automatically includes
- Removed duplicated include's of my_sys.h
- Replaced include my_config.h with my_global.h
Diffstat (limited to 'plugin/handler_socket/libhsclient')
| -rw-r--r-- | plugin/handler_socket/libhsclient/auto_addrinfo.hpp | 3 | ||||
| -rw-r--r-- | plugin/handler_socket/libhsclient/hstcpcli.cpp | 3 | ||||
| -rw-r--r-- | plugin/handler_socket/libhsclient/socket.cpp | 5 |
3 files changed, 3 insertions, 8 deletions
diff --git a/plugin/handler_socket/libhsclient/auto_addrinfo.hpp b/plugin/handler_socket/libhsclient/auto_addrinfo.hpp index aee22a1d0f6..f9db70fe971 100644 --- a/plugin/handler_socket/libhsclient/auto_addrinfo.hpp +++ b/plugin/handler_socket/libhsclient/auto_addrinfo.hpp @@ -9,8 +9,7 @@ #ifndef DENA_AUTO_ADDRINFO_HPP #define DENA_AUTO_ADDRINFO_HPP -#include <my_config.h> -#include <sys/types.h> +#include <my_global.h> #include <sys/socket.h> #include <netdb.h> #include <string.h> diff --git a/plugin/handler_socket/libhsclient/hstcpcli.cpp b/plugin/handler_socket/libhsclient/hstcpcli.cpp index 21c964cb046..461bed3f5d0 100644 --- a/plugin/handler_socket/libhsclient/hstcpcli.cpp +++ b/plugin/handler_socket/libhsclient/hstcpcli.cpp @@ -6,8 +6,7 @@ * See COPYRIGHT.txt for details. */ -#include <my_config.h> - +#include <my_global.h> #include <stdexcept> #include "hstcpcli.hpp" diff --git a/plugin/handler_socket/libhsclient/socket.cpp b/plugin/handler_socket/libhsclient/socket.cpp index 2c93a3b4846..f1cdc9fb20f 100644 --- a/plugin/handler_socket/libhsclient/socket.cpp +++ b/plugin/handler_socket/libhsclient/socket.cpp @@ -6,13 +6,10 @@ * See COPYRIGHT.txt for details. */ -#include <my_config.h> +#include <my_global.h> #include <stdexcept> #include <string.h> -#include <errno.h> -#include <unistd.h> -#include <fcntl.h> #include <signal.h> #include <sys/un.h> |