mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
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
This commit is contained in:
@ -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
|
||||
|
Reference in New Issue
Block a user