database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-07 06:01:31 +03:00
Code Activity

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new

Browse Source 
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
This commit is contained in:
serg@serg.mylan
2006-02-14 22:57:12 +01:00
parent dd999e9eee a511d770ee
commit 94d225aa6f
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/mysql/plugin.h
View File

@ -48,7 +48,7 @@ struct st_mysql_plugin _mysql_plugin_declarations_[]= {
*/ */
enum enum_mysql_show_type enum enum_mysql_show_type
{ {
SHOW_UNDEF, SHOW_BOOL, SHOW_MY_BOOL, SHOW_INT, SHOW_LONG, SHOW_UNDEF, SHOW_BOOL, SHOW_INT, SHOW_LONG,
SHOW_LONGLONG, SHOW_CHAR, SHOW_CHAR_PTR, SHOW_LONGLONG, SHOW_CHAR, SHOW_CHAR_PTR,
SHOW_ARRAY, SHOW_FUNC SHOW_ARRAY, SHOW_FUNC
}; };

2
sql/sql_plugin.h
View File

@ -23,7 +23,7 @@
*/ */
#define SHOW_FUNC SHOW_FUNC, SHOW_KEY_CACHE_LONG, SHOW_KEY_CACHE_LONGLONG, \ #define SHOW_FUNC SHOW_FUNC, SHOW_KEY_CACHE_LONG, SHOW_KEY_CACHE_LONGLONG, \
SHOW_LONG_STATUS, SHOW_DOUBLE_STATUS, SHOW_HAVE, \ SHOW_LONG_STATUS, SHOW_DOUBLE_STATUS, SHOW_HAVE, \
SHOW_HA_ROWS, SHOW_SYS, SHOW_LONG_NOFLUSH SHOW_MY_BOOL, SHOW_HA_ROWS, SHOW_SYS, SHOW_LONG_NOFLUSH
#include <mysql/plugin.h> #include <mysql/plugin.h>
#undef SHOW_FUNC #undef SHOW_FUNC
typedef enum enum_mysql_show_type SHOW_TYPE; typedef enum enum_mysql_show_type SHOW_TYPE;