1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/my_global.h
View File

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

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

4
sql/item_func.cc
View File

@ -25,7 +25,7 @@
#pragma implementation // gcc: Class implementation
#endif
#include "my_global.h" /* NO_EMBEDDED_ACCESS_CHECKS */
#include "sql_plugin.h"
#include "sql_priv.h"
/*
It is necessary to include set_var.h instead of item.h because there
@ -52,8 +52,6 @@
#include "sp.h"
#include "set_var.h"
#include "debug_sync.h"
#include <mysql/plugin.h>
#include <mysql/service_thd_wait.h>
#ifdef NO_EMBEDDED_ACCESS_CHECKS
#define sp_restore_security_context(A,B) while (0) {}

2
sql/mysqld.cc
View File

@ -14,7 +14,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#include "my_global.h" /* NO_EMBEDDED_ACCESS_CHECKS */
#include "sql_plugin.h"
#include "sql_priv.h"
#include "unireg.h"
#include <signal.h>

2
sql/set_var.cc
View File

@ -16,7 +16,7 @@
/* variable declarations are in sys_vars.cc now !!! */
#include "my_global.h" /* NO_EMBEDDED_ACCESS_CHECKS */
#include "sql_plugin.h"
#include "sql_class.h" // set_var.h: session_var_ptr
#include "set_var.h"
#include "sql_priv.h"

2
sql/sql_plugin.cc
View File

@ -15,9 +15,9 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
#include "sql_plugin.h"
#include "sql_priv.h" // SHOW_MY_BOOL
#include "unireg.h"
#include "my_global.h" // REQUIRED by m_string.h
#include "sql_class.h" // set_var.h: THD
#include "sys_vars_shared.h"
#include "sql_locale.h"

3
sql/sql_plugin.h
View File

@ -17,7 +17,6 @@
#ifndef _sql_plugin_h
#define _sql_plugin_h
#include <my_global.h>
/*
the following #define adds server-only members to enum_mysql_show_type,
@ -27,7 +26,7 @@
SHOW_LONG_STATUS, SHOW_DOUBLE_STATUS, \
SHOW_HAVE, SHOW_MY_BOOL, SHOW_HA_ROWS, SHOW_SYS, \
SHOW_LONG_NOFLUSH, SHOW_LONGLONG_STATUS, SHOW_LEX_STRING
#include <mysql/plugin.h>
#include <my_global.h>
#undef SHOW_always_last
#include "m_string.h" /* LEX_STRING */

2
sql/sql_show.cc
View File

@ -17,7 +17,7 @@
/* Function with list databases, tables or fields */
#include "my_global.h" /* NO_EMBEDDED_ACCESS_CHECKS */
#include "sql_plugin.h"
#include "sql_priv.h"
#include "unireg.h"
#include "sql_acl.h" // fill_schema_*_privileges

2
sql/sys_vars.cc
View File

@ -31,7 +31,7 @@
(for example in storage/myisam/ha_myisam.cc) !
*/
#include "my_global.h" /* NO_EMBEDDED_ACCESS_CHECKS */
#include "sql_plugin.h"
#include "sql_priv.h"
#include "sql_class.h" // set_var.h: THD
#include "sys_vars.h"

4
storage/perfschema/ha_perfschema.cc
View File

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