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/my_global.h | |
| 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/my_global.h')
| -rw-r--r-- | include/my_global.h | 3 |
1 files changed, 2 insertions, 1 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) |