diff options
| author | unknown <tonu@volk.internalnet> | 2001-09-30 10:47:32 +0800 |
|---|---|---|
| committer | unknown <tonu@volk.internalnet> | 2001-09-30 10:47:32 +0800 |
| commit | 6e8704ee0993b4f06d1c3626291346d20c6d60cb (patch) | |
| tree | 23320c30b5375f656671ecf64934369738776dda /sql/structs.h | |
| parent | ad9c7236a026395e5d7e6faf7ec83689f631ca40 (diff) | |
| parent | d13f2dfdeb2b23c6abfb608885e8717878122a7b (diff) | |
| download | mariadb-git-6e8704ee0993b4f06d1c3626291346d20c6d60cb.tar.gz | |
Merge work.mysql.com:/home/bk/mysql-4.0
into volk.internalnet:/home/tonu/mysql-4.0
acinclude.m4:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/structs.h:
Auto merged
Docs/manual.texi:
Auto merged
Diffstat (limited to 'sql/structs.h')
| -rw-r--r-- | sql/structs.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/structs.h b/sql/structs.h index 469d3feea08..2f6f850bc9e 100644 --- a/sql/structs.h +++ b/sql/structs.h @@ -134,7 +134,11 @@ enum SHOW_TYPE { SHOW_LONG,SHOW_CHAR,SHOW_INT,SHOW_CHAR_PTR,SHOW_BOOL, ,SHOW_SSL_CTX_SESS_GET_CACHE_SIZE, SHOW_SSL_GET_CIPHER ,SHOW_SSL_GET_DEFAULT_TIMEOUT, SHOW_SSL_GET_VERIFY_MODE ,SHOW_SSL_CTX_GET_VERIFY_MODE, SHOW_SSL_GET_VERIFY_DEPTH - ,SHOW_SSL_CTX_GET_VERIFY_DEPTH + ,SHOW_SSL_CTX_GET_VERIFY_DEPTH, SHOW_SSL_CTX_SESS_CONNECT + ,SHOW_SSL_CTX_SESS_CONNECT_RENEGOTIATE, SHOW_SSL_CTX_SESS_CONNECT_GOOD + ,SHOW_SSL_CTX_SESS_HITS, SHOW_SSL_CTX_SESS_MISSES + ,SHOW_SSL_CTX_SESS_TIMEOUTS, SHOW_SSL_CTX_SESS_CACHE_FULL + ,SHOW_SSL_GET_CIPHER_LIST #endif /* HAVE_OPENSSL */ }; |