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

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 */