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 /mysys | |
| 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 'mysys')
| -rw-r--r-- | mysys/my_basename.c | 1 | ||||
| -rw-r--r-- | mysys/waiting_threads.c | 1 | ||||
| -rw-r--r-- | mysys/wqueue.c | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/mysys/my_basename.c b/mysys/my_basename.c index 9d1eaf53efa..4a1de782863 100644 --- a/mysys/my_basename.c +++ b/mysys/my_basename.c @@ -13,6 +13,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <my_global.h> #include <my_sys.h> /** @brief retrieve last component of the filename. diff --git a/mysys/waiting_threads.c b/mysys/waiting_threads.c index 2549bd8a587..df208507590 100644 --- a/mysys/waiting_threads.c +++ b/mysys/waiting_threads.c @@ -172,6 +172,7 @@ !! thread4 should not wait for thread2. */ +#include <my_global.h> #include <waiting_threads.h> #include <m_string.h> diff --git a/mysys/wqueue.c b/mysys/wqueue.c index 1dafc03b935..d4f699fd9bc 100644 --- a/mysys/wqueue.c +++ b/mysys/wqueue.c @@ -15,6 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ +#include <my_global.h> #include <wqueue.h> #define STRUCT_PTR(TYPE, MEMBER, a) \ |