diff options
author | Mats Kindahl <mats.kindahl@oracle.com> | 2010-08-16 14:50:27 +0200 |
---|---|---|
committer | Mats Kindahl <mats.kindahl@oracle.com> | 2010-08-16 14:50:27 +0200 |
commit | b0836bd309e5b7857771ccae7096f0fdcdfc58e2 (patch) | |
tree | 60ab98cb19a6a71445b167b4cbc5308f59767cc9 /vio/viossl.c | |
parent | 0ea3fb557deb017cd96f1e57694d56a5ace8c80c (diff) | |
parent | 7017775fd11c4249c1b64ff45564c88b94cf526f (diff) | |
download | mariadb-git-b0836bd309e5b7857771ccae7096f0fdcdfc58e2.tar.gz |
Merging with mysql-5.5-stage.
Diffstat (limited to 'vio/viossl.c')
-rw-r--r-- | vio/viossl.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/vio/viossl.c b/vio/viossl.c index 79f358b047c..5cb5f36f20d 100644 --- a/vio/viossl.c +++ b/vio/viossl.c @@ -244,6 +244,9 @@ int vio_ssl_blocking(Vio *vio __attribute__((unused)), return (set_blocking_mode ? 0 : 1); } - +my_bool vio_ssl_has_data(Vio *vio) +{ + return SSL_pending(vio->ssl_arg) > 0 ? TRUE : FALSE; +} #endif /* HAVE_OPENSSL */ |