diff options
| author | Alexander Barkov <bar@mnogosearch.org> | 2013-06-03 11:57:34 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mnogosearch.org> | 2013-06-03 11:57:34 +0400 |
| commit | 1fe92fb87db4a59ca0a4ac1ab1223e3cbe2b8232 (patch) | |
| tree | 6367735950e62e3bbbc6c8ea643f32461c206c12 /storage | |
| parent | 0aa4fb73a49993d3a73550ee624b62d7556f8515 (diff) | |
| download | mariadb-git-1fe92fb87db4a59ca0a4ac1ab1223e3cbe2b8232.tar.gz | |
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
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/perfschema/ha_perfschema.cc | 4 |
1 files changed, 1 insertions, 3 deletions
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" |