summaryrefslogtreecommitdiff
path: root/vio/viossl.c
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2012-08-17 16:46:34 +0300
committerMichael Widenius <monty@askmonty.org>2012-08-17 16:46:34 +0300
commitf1159b18d930910d5b5b9c454a17b0ee66f853c3 (patch)
tree67d9ac4fb191347f0fff24a4b2b1f0e9fceda319 /vio/viossl.c
parent60589aeee03949033c66da5c1eae70d4342179fc (diff)
downloadmariadb-git-f1159b18d930910d5b5b9c454a17b0ee66f853c3.tar.gz
More fixes
Diffstat (limited to 'vio/viossl.c')
-rw-r--r--vio/viossl.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/vio/viossl.c b/vio/viossl.c
index dfca68947cc..74ad97809e2 100644
--- a/vio/viossl.c
+++ b/vio/viossl.c
@@ -451,6 +451,16 @@ int sslconnect(struct st_VioSSLFd *ptr, Vio *vio, long timeout, unsigned long *e
}
+int vio_ssl_blocking(Vio *vio __attribute__((unused)),
+ my_bool set_blocking_mode,
+ my_bool *old_mode)
+{
+ /* Mode is always blocking */
+ *old_mode= 1;
+ /* Return error if we try to change to non_blocking mode */
+ return (set_blocking_mode ? 0 : 1);
+}
+
my_bool vio_ssl_has_data(Vio *vio)
{
return SSL_pending(vio->ssl_arg) > 0 ? TRUE : FALSE;