diff options
| -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 | ||||
| -rw-r--r-- | sql/item_func.cc | 4 | ||||
| -rw-r--r-- | sql/mysqld.cc | 2 | ||||
| -rw-r--r-- | sql/set_var.cc | 2 | ||||
| -rw-r--r-- | sql/sql_plugin.cc | 2 | ||||
| -rw-r--r-- | sql/sql_plugin.h | 3 | ||||
| -rw-r--r-- | sql/sql_show.cc | 2 | ||||
| -rw-r--r-- | sql/sys_vars.cc | 2 | ||||
| -rw-r--r-- | storage/perfschema/ha_perfschema.cc | 4 |
14 files changed, 15 insertions, 18 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 diff --git a/sql/item_func.cc b/sql/item_func.cc index d0fca63688a..d412032fa0f 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -25,7 +25,7 @@ #pragma implementation // gcc: Class implementation #endif -#include "my_global.h" /* NO_EMBEDDED_ACCESS_CHECKS */ +#include "sql_plugin.h" #include "sql_priv.h" /* It is necessary to include set_var.h instead of item.h because there @@ -52,8 +52,6 @@ #include "sp.h" #include "set_var.h" #include "debug_sync.h" -#include <mysql/plugin.h> -#include <mysql/service_thd_wait.h> #ifdef NO_EMBEDDED_ACCESS_CHECKS #define sp_restore_security_context(A,B) while (0) {} diff --git a/sql/mysqld.cc b/sql/mysqld.cc index fd8b990b6c3..38d58babd64 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -14,7 +14,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "my_global.h" /* NO_EMBEDDED_ACCESS_CHECKS */ +#include "sql_plugin.h" #include "sql_priv.h" #include "unireg.h" #include <signal.h> diff --git a/sql/set_var.cc b/sql/set_var.cc index 18d86a13998..5f5faa83a45 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -16,7 +16,7 @@ /* variable declarations are in sys_vars.cc now !!! */ -#include "my_global.h" /* NO_EMBEDDED_ACCESS_CHECKS */ +#include "sql_plugin.h" #include "sql_class.h" // set_var.h: session_var_ptr #include "set_var.h" #include "sql_priv.h" diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc index 72f16ba7837..3c827ddda3b 100644 --- a/sql/sql_plugin.cc +++ b/sql/sql_plugin.cc @@ -15,9 +15,9 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "sql_plugin.h" #include "sql_priv.h" // SHOW_MY_BOOL #include "unireg.h" -#include "my_global.h" // REQUIRED by m_string.h #include "sql_class.h" // set_var.h: THD #include "sys_vars_shared.h" #include "sql_locale.h" diff --git a/sql/sql_plugin.h b/sql/sql_plugin.h index 906ff20ddb7..5327b27e97c 100644 --- a/sql/sql_plugin.h +++ b/sql/sql_plugin.h @@ -17,7 +17,6 @@ #ifndef _sql_plugin_h #define _sql_plugin_h -#include <my_global.h> /* the following #define adds server-only members to enum_mysql_show_type, @@ -27,7 +26,7 @@ SHOW_LONG_STATUS, SHOW_DOUBLE_STATUS, \ SHOW_HAVE, SHOW_MY_BOOL, SHOW_HA_ROWS, SHOW_SYS, \ SHOW_LONG_NOFLUSH, SHOW_LONGLONG_STATUS, SHOW_LEX_STRING -#include <mysql/plugin.h> +#include <my_global.h> #undef SHOW_always_last #include "m_string.h" /* LEX_STRING */ diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 48fb926bfcc..623f737a62b 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -17,7 +17,7 @@ /* Function with list databases, tables or fields */ -#include "my_global.h" /* NO_EMBEDDED_ACCESS_CHECKS */ +#include "sql_plugin.h" #include "sql_priv.h" #include "unireg.h" #include "sql_acl.h" // fill_schema_*_privileges diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index 8c5a6c92a6b..cff36ac3bdd 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -31,7 +31,7 @@ (for example in storage/myisam/ha_myisam.cc) ! */ -#include "my_global.h" /* NO_EMBEDDED_ACCESS_CHECKS */ +#include "sql_plugin.h" #include "sql_priv.h" #include "sql_class.h" // set_var.h: THD #include "sys_vars.h" diff --git a/storage/perfschema/ha_perfschema.cc b/storage/perfschema/ha_perfschema.cc index c6c967ceb9d..aca5ad8c731 100644 --- a/storage/perfschema/ha_perfschema.cc +++ b/storage/perfschema/ha_perfschema.cc @@ -18,11 +18,9 @@ Performance schema storage engine (implementation). */ -#include "my_global.h" +#include "sql_plugin.h" #include "my_pthread.h" #include "my_atomic.h" -#include "sql_plugin.h" -#include "mysql/plugin.h" #include "ha_perfschema.h" #include "pfs_engine_table.h" #include "pfs_column_values.h" |