diff options
| author | unknown <serg@serg.mylan> | 2006-02-14 22:57:12 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2006-02-14 22:57:12 +0100 |
| commit | 0ae5e4c1ef58f5b9e2eef779d00e3c03fc13ca0b (patch) | |
| tree | 784136d72eb53d8f943960bd953a2ef5c3251d98 /sql/sql_plugin.h | |
| parent | db3a5936d3b632b45bb3b3fe56163c15ac21e475 (diff) | |
| parent | 53031dae8515e735093fd602ed10615bff1c03e7 (diff) | |
| download | mariadb-git-0ae5e4c1ef58f5b9e2eef779d00e3c03fc13ca0b.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
sql/sql_plugin.h:
Auto merged
include/mysql/plugin.h:
Auto merged
Diffstat (limited to 'sql/sql_plugin.h')
| -rw-r--r-- | sql/sql_plugin.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_plugin.h b/sql/sql_plugin.h index 52bfc44496b..672db105cd1 100644 --- a/sql/sql_plugin.h +++ b/sql/sql_plugin.h @@ -23,7 +23,7 @@ */ #define SHOW_FUNC SHOW_FUNC, SHOW_KEY_CACHE_LONG, SHOW_KEY_CACHE_LONGLONG, \ 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> #undef SHOW_FUNC typedef enum enum_mysql_show_type SHOW_TYPE; |