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 /include | |
| 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 'include')
| -rw-r--r-- | include/mysql/plugin.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/mysql/plugin.h b/include/mysql/plugin.h index 06eb0e91366..a7b3606061f 100644 --- a/include/mysql/plugin.h +++ b/include/mysql/plugin.h @@ -48,7 +48,7 @@ struct st_mysql_plugin _mysql_plugin_declarations_[]= { */ 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_ARRAY, SHOW_FUNC }; |