diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 3 | ||||
| -rw-r--r-- | include/mysql/plugin.h | 2 | ||||
| -rw-r--r-- | include/mysql/plugin_audit.h.pp | 2 | ||||
| -rw-r--r-- | include/mysql/plugin_auth.h.pp | 2 | ||||
| -rw-r--r-- | include/mysql/plugin_ftparser.h.pp | 2 | ||||
| -rw-r--r-- | include/mysql/service_thd_timezone.h | 1 |
6 files changed, 7 insertions, 5 deletions
diff --git a/include/my_global.h b/include/my_global.h index b3c7819c9a5..b50db1fc5f3 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -1002,8 +1002,9 @@ typedef struct st_mysql_lex_string LEX_STRING; #define SOCKET_EMFILE EMFILE #endif +#include <mysql/plugin.h> /* my_bool */ + typedef ulong myf; /* Type of MyFlags in my_funcs */ -typedef char my_bool; /* Small bool */ #define MYF(v) (myf) (v) diff --git a/include/mysql/plugin.h b/include/mysql/plugin.h index db9b8e2aa9a..a96e3e72b7b 100644 --- a/include/mysql/plugin.h +++ b/include/mysql/plugin.h @@ -45,6 +45,8 @@ class Item; #define MYSQL_THD void* #endif +typedef char my_bool; + #include <mysql/services.h> #define MYSQL_XIDDATASIZE 128 diff --git a/include/mysql/plugin_audit.h.pp b/include/mysql/plugin_audit.h.pp index 8648bd6383d..e51cbc4b851 100644 --- a/include/mysql/plugin_audit.h.pp +++ b/include/mysql/plugin_audit.h.pp @@ -1,4 +1,5 @@ #include "plugin.h" +typedef char my_bool; #include <mysql/services.h> #include <mysql/service_my_snprintf.h> extern struct my_snprintf_service_st { @@ -86,7 +87,6 @@ extern struct kill_statement_service_st { } *thd_kill_statement_service; enum thd_kill_levels thd_kill_level(const void*); #include <mysql/service_thd_timezone.h> -typedef char my_bool; #include "mysql_time.h" typedef long my_time_t; enum enum_mysql_timestamp_type diff --git a/include/mysql/plugin_auth.h.pp b/include/mysql/plugin_auth.h.pp index d291a87012a..28172286fb3 100644 --- a/include/mysql/plugin_auth.h.pp +++ b/include/mysql/plugin_auth.h.pp @@ -1,4 +1,5 @@ #include <mysql/plugin.h> +typedef char my_bool; #include <mysql/services.h> #include <mysql/service_my_snprintf.h> extern struct my_snprintf_service_st { @@ -86,7 +87,6 @@ extern struct kill_statement_service_st { } *thd_kill_statement_service; enum thd_kill_levels thd_kill_level(const void*); #include <mysql/service_thd_timezone.h> -typedef char my_bool; #include "mysql_time.h" typedef long my_time_t; enum enum_mysql_timestamp_type diff --git a/include/mysql/plugin_ftparser.h.pp b/include/mysql/plugin_ftparser.h.pp index b0143db4784..532e049cf53 100644 --- a/include/mysql/plugin_ftparser.h.pp +++ b/include/mysql/plugin_ftparser.h.pp @@ -1,4 +1,5 @@ #include "plugin.h" +typedef char my_bool; #include <mysql/services.h> #include <mysql/service_my_snprintf.h> extern struct my_snprintf_service_st { @@ -86,7 +87,6 @@ extern struct kill_statement_service_st { } *thd_kill_statement_service; enum thd_kill_levels thd_kill_level(const void*); #include <mysql/service_thd_timezone.h> -typedef char my_bool; #include "mysql_time.h" typedef long my_time_t; enum enum_mysql_timestamp_type diff --git a/include/mysql/service_thd_timezone.h b/include/mysql/service_thd_timezone.h index f8bddba68bb..f44f011b891 100644 --- a/include/mysql/service_thd_timezone.h +++ b/include/mysql/service_thd_timezone.h @@ -38,7 +38,6 @@ */ #endif -typedef char my_bool; #include "mysql_time.h" #ifdef __cplusplus |