diff options
| author | unknown <sergefp@mysql.com> | 2005-05-26 21:01:53 +0200 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2005-05-26 21:01:53 +0200 |
| commit | 598b7631cd2fccf315ca28cc372d07a2a5c8ecbb (patch) | |
| tree | aa1d5fa63a6ba1a39d06e35d826b5a7407facfb5 /sql/structs.h | |
| parent | e3beea23a0f202866c293947a74fc6df092e5763 (diff) | |
| parent | 48e0630d2f71b47a12ef85124bba570d73ff7b65 (diff) | |
| download | mariadb-git-598b7631cd2fccf315ca28cc372d07a2a5c8ecbb.tar.gz | |
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-conf-fixes-2
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/structs.h:
Auto merged
Diffstat (limited to 'sql/structs.h')
| -rw-r--r-- | sql/structs.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/structs.h b/sql/structs.h index 14c0100f5be..8f053f20776 100644 --- a/sql/structs.h +++ b/sql/structs.h @@ -164,7 +164,8 @@ typedef struct st_known_date_time_format { enum SHOW_TYPE { SHOW_UNDEF, - SHOW_LONG, SHOW_LONGLONG, SHOW_INT, SHOW_CHAR, SHOW_CHAR_PTR, SHOW_DOUBLE, + SHOW_LONG, SHOW_LONGLONG, SHOW_INT, SHOW_CHAR, SHOW_CHAR_PTR, + SHOW_DOUBLE_STATUS, SHOW_BOOL, SHOW_MY_BOOL, SHOW_OPENTABLES, SHOW_STARTTIME, SHOW_QUESTION, SHOW_LONG_CONST, SHOW_INT_CONST, SHOW_HAVE, SHOW_SYS, SHOW_HA_ROWS, SHOW_VARS, |