diff options
| author | unknown <petr@mysql.com> | 2004-11-18 14:53:21 +0300 |
|---|---|---|
| committer | unknown <petr@mysql.com> | 2004-11-18 14:53:21 +0300 |
| commit | e1f5b3f926ec7b2f582f975c867d2cc1877c1844 (patch) | |
| tree | b70c2bfed5cff7af70738e97f5524c8afa7e34c8 /sql/structs.h | |
| parent | cd2edd171396ba8041f4e0109e0f339b9b99ee0c (diff) | |
| parent | 4dac69eb11839d9c996669f88aba0230916efcbc (diff) | |
| download | mariadb-git-e1f5b3f926ec7b2f582f975c867d2cc1877c1844.tar.gz | |
Merge mysql.com:/home/cps/mysql/trees/mysql-5.0
into mysql.com:/home/cps/mysql/devel/innotask/mysql-5.0-inno-final
sql/ha_innodb.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.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 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/structs.h b/sql/structs.h index 4f0044e4f82..c02f8c502a2 100644 --- a/sql/structs.h +++ b/sql/structs.h @@ -166,6 +166,7 @@ enum SHOW_TYPE SHOW_LONG, SHOW_LONGLONG, SHOW_INT, SHOW_CHAR, SHOW_CHAR_PTR, SHOW_DOUBLE, 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, #ifdef HAVE_OPENSSL SHOW_SSL_CTX_SESS_ACCEPT, SHOW_SSL_CTX_SESS_ACCEPT_GOOD, SHOW_SSL_GET_VERSION, SHOW_SSL_CTX_GET_SESSION_CACHE_MODE, |