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 /storage/connect/mycat.cc | |
| 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 'storage/connect/mycat.cc')
| -rw-r--r-- | storage/connect/mycat.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/storage/connect/mycat.cc b/storage/connect/mycat.cc index 906ac734157..2dcf807e9b5 100644 --- a/storage/connect/mycat.cc +++ b/storage/connect/mycat.cc @@ -28,20 +28,16 @@ /***********************************************************************/ /* Include relevant MariaDB header file. */ /***********************************************************************/ -#include <my_config.h> +#define DONT_DEFINE_VOID +#include <my_global.h> #if defined(__WIN__) //#include <windows.h> //#include <sqlext.h> #elif defined(UNIX) -#include <sys/types.h> #include <unistd.h> -#include <stdlib.h> -#include <stdio.h> #include <string.h> #endif -#define DONT_DEFINE_VOID -//#include <mysql/plugin.h> #include "handler.h" #undef OFFSET |