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/spider/spd_trx.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/spider/spd_trx.cc')
-rw-r--r-- | storage/spider/spd_trx.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/storage/spider/spd_trx.cc b/storage/spider/spd_trx.cc index 8ba46774cfb..f0519bb334b 100644 --- a/storage/spider/spd_trx.cc +++ b/storage/spider/spd_trx.cc @@ -14,6 +14,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #define MYSQL_SERVER 1 +#include <my_global.h> #include "mysql_version.h" #if MYSQL_VERSION_ID < 50500 #include "mysql_priv.h" |