From 1fe92fb87db4a59ca0a4ac1ab1223e3cbe2b8232 Mon Sep 17 00:00:00 2001 From: Alexander Barkov Date: Mon, 3 Jun 2013 11:57:34 +0400 Subject: Fixing the problem with my_bool_t defined two times. (it worked fine with the modern gcc, but failed on some other compilers). modified: include/my_global.h include/mysql/plugin.h include/mysql/plugin_audit.h.pp include/mysql/plugin_auth.h.pp include/mysql/plugin_ftparser.h.pp include/mysql/service_thd_timezone.h sql/item_func.cc sql/mysqld.cc sql/set_var.cc sql/sql_plugin.cc sql/sql_plugin.h sql/sql_show.cc sql/sys_vars.cc storage/perfschema/ha_perfschema.cc --- storage/perfschema/ha_perfschema.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'storage/perfschema/ha_perfschema.cc') 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" -- cgit v1.2.1