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 /include/mysql/plugin_audit.h.pp | |
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 'include/mysql/plugin_audit.h.pp')
-rw-r--r-- | include/mysql/plugin_audit.h.pp | 2 |
1 files changed, 1 insertions, 1 deletions
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 |