database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Fixing the problem with my_bool_t defined two times.

Browse Source 
(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:
Alexander Barkov
2013-06-03 11:57:34 +04:00
parent 0aa4fb73a4
commit 1fe92fb87d
14 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/mysql/plugin.h
View File

@@ -45,6 +45,8 @@ class Item;
#define MYSQL_THD void*
#endif
typedef char my_bool;
#include <mysql/services.h>
#define MYSQL_XIDDATASIZE 128

2
include/mysql/plugin_audit.h.pp
View File

@@ -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

2
include/mysql/plugin_auth.h.pp
View File

@@ -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

2
include/mysql/plugin_ftparser.h.pp
View File

@@ -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

1
include/mysql/service_thd_timezone.h
View File

@@ -38,7 +38,6 @@
*/
#endif
typedef char my_bool;
#include "mysql_time.h"
#ifdef __cplusplus