From 7bf903ea1044ad3776a6e688d437a21efaa84e18 Mon Sep 17 00:00:00 2001 From: "gluh@gluh.(none)" <> Date: Tue, 5 Nov 2002 12:05:58 +0400 Subject: Error code for ssl connection Fix bug when server hang(with SSL, with modified libmysql) Add options master-ssl-capath and master-ssl-cipher Add some error checking(SSL) --- include/errmsg.h | 1 + include/violite.h | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/errmsg.h b/include/errmsg.h index 76a57f47611..842d53c9303 100644 --- a/include/errmsg.h +++ b/include/errmsg.h @@ -61,3 +61,4 @@ extern const char *client_errors[]; /* Error messages */ #define CR_PROBE_SLAVE_HOSTS 2023 #define CR_PROBE_SLAVE_CONNECT 2024 #define CR_PROBE_MASTER_CONNECT 2025 +#define CR_SSL_CONNECTION_ERROR 2026 diff --git a/include/violite.h b/include/violite.h index f4f40dcb64b..6c8ad1f4b69 100644 --- a/include/violite.h +++ b/include/violite.h @@ -174,7 +174,7 @@ struct st_VioSSLConnectorFd SSL_METHOD* ssl_method_; }; -void sslaccept(struct st_VioSSLAcceptorFd*, Vio*, long timeout); +int sslaccept(struct st_VioSSLAcceptorFd*, Vio*, long timeout); int sslconnect(struct st_VioSSLConnectorFd*, Vio*, long timeout); struct st_VioSSLConnectorFd @@ -231,7 +231,6 @@ struct st_vio #ifdef HAVE_OPENSSL SSL* ssl_; - my_bool open_; #endif /* HAVE_OPENSSL */ #endif /* HAVE_VIO */ }; -- cgit v1.2.1