summaryrefslogtreecommitdiff
path: root/sql/structs.h
diff options
context:
space:
mode:
authorunknown <tonu@x153.internalnet>2001-08-27 03:34:52 +0800
committerunknown <tonu@x153.internalnet>2001-08-27 03:34:52 +0800
commita1f5a1094a654c37ca7d3a5ee076bfedc16c4584 (patch)
tree9788e564a1e5b119ac0c66775e373efcc18bfeca /sql/structs.h
parentd853390e56f6ba77d99db3bc37f8f5e372450847 (diff)
downloadmariadb-git-a1f5a1094a654c37ca7d3a5ee076bfedc16c4584.tar.gz
OpenSSL changes
BitKeeper/etc/ignore: Added vio/test-sslclient vio/test-sslserver to the ignore list client/mysql.cc: Let make mysql client tell user about cipher in use sql/mini_client.cc: Synced SSL stuff with libmysql code sql/mysqld.cc: Preaparations to turn replication SSL on Stuff to output SSL variables with SHOW STATUS command sql/sql_show.cc: Stuff to output SSL variables with SHOW STATUS command sql/structs.h: Stuff to output SSL variables with SHOW STATUS command vio/viossl.c: Major modifications vio/viosslfactories.c: SSL fixes
Diffstat (limited to 'sql/structs.h')
-rw-r--r--sql/structs.h13
1 files changed, 12 insertions, 1 deletions
diff --git a/sql/structs.h b/sql/structs.h
index 594432134b2..12ba5004a2e 100644
--- a/sql/structs.h
+++ b/sql/structs.h
@@ -125,7 +125,18 @@ typedef struct {
enum SHOW_TYPE { SHOW_LONG,SHOW_CHAR,SHOW_INT,SHOW_CHAR_PTR,SHOW_BOOL,
SHOW_MY_BOOL,SHOW_OPENTABLES,SHOW_STARTTIME,SHOW_QUESTION,
- SHOW_LONG_CONST, SHOW_INT_CONST, SHOW_HAVE};
+ SHOW_LONG_CONST, SHOW_INT_CONST, SHOW_HAVE
+#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
+ ,SHOW_SSL_CTX_SESS_CB_HITS, SHOW_SSL_CTX_SESS_ACCEPT_RENEGOTIATE
+ ,SHOW_SSL_CTX_SESS_NUMBER, SHOW_SSL_SESSION_REUSED
+ ,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
+#endif /* HAVE_OPENSSL */
+};
enum SHOW_COMP_OPTION { SHOW_OPTION_YES, SHOW_OPTION_NO, SHOW_OPTION_DISABLED};