diff options
Diffstat (limited to 'vio')
| -rw-r--r-- | vio/viosocket.c | 4 | ||||
| -rw-r--r-- | vio/viosslfactories.c | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/vio/viosocket.c b/vio/viosocket.c index 4772847abd8..9840891b69e 100644 --- a/vio/viosocket.c +++ b/vio/viosocket.c @@ -1,5 +1,5 @@ /* - Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2001, 2011, Oracle and/or its affiliates This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -692,7 +692,9 @@ my_bool vio_is_connected(Vio *vio) void vio_timeout(Vio *vio, uint which, uint timeout) { #if defined(SO_SNDTIMEO) && defined(SO_RCVTIMEO) +#ifndef DBUG_OFF int r; +#endif DBUG_ENTER("vio_timeout"); { diff --git a/vio/viosslfactories.c b/vio/viosslfactories.c index 7c9269de853..f64869e905d 100644 --- a/vio/viosslfactories.c +++ b/vio/viosslfactories.c @@ -284,7 +284,8 @@ new_VioSSLAcceptorFd(const char *key_file, const char *cert_file, struct st_VioSSLFd *ssl_fd; int verify= SSL_VERIFY_PEER | SSL_VERIFY_CLIENT_ONCE; if (!(ssl_fd= new_VioSSLFd(key_file, cert_file, ca_file, - ca_path, cipher, TLSv1_server_method(), error))) + ca_path, cipher, + (SSL_METHOD*) TLSv1_server_method(), error))) { return 0; } |