summaryrefslogtreecommitdiff
path: root/sql/bounded_queue.h
diff options
context:
space:
mode:
authorMichael Widenius <monty@mariadb.org>2017-06-18 06:42:16 +0300
committerSergei Golubchik <serg@mariadb.org>2017-08-24 01:05:44 +0200
commit4aaa38d26ed95127b8424100c8a14c77af15fc11 (patch)
treefd96b83db1e58971f25b7a27239b07cdca0f0793 /sql/bounded_queue.h
parentb0da8897b08b0717ccae418f880b5ab0f5960312 (diff)
downloadmariadb-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 'sql/bounded_queue.h')
-rw-r--r--sql/bounded_queue.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/bounded_queue.h b/sql/bounded_queue.h
index 3573c5ceb27..d7c28215631 100644
--- a/sql/bounded_queue.h
+++ b/sql/bounded_queue.h
@@ -16,9 +16,8 @@
#ifndef BOUNDED_QUEUE_INCLUDED
#define BOUNDED_QUEUE_INCLUDED
-#include "my_global.h"
#include "my_base.h"
-#include "my_sys.h"
+#include <my_sys.h>
#include "queues.h"
#include <string.h>