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 | cd347705585b99c242efaf63550ace6819610795 (patch) | |
tree | 60ab98cb19a6a71445b167b4cbc5308f59767cc9 /vio/vio_priv.h | |
parent | 5cb0ccebf3115d752a04b0eb4d2e153e3ac102f6 (diff) | |
parent | 71553c2c9db3c4c27973f12461b986c59e1dabfb (diff) | |
download | mariadb-git-cd347705585b99c242efaf63550ace6819610795.tar.gz |
Merging with mysql-5.5-stage.
Diffstat (limited to 'vio/vio_priv.h')
-rw-r--r-- | vio/vio_priv.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/vio/vio_priv.h b/vio/vio_priv.h index 69eb26083d6..1bfb857b039 100644 --- a/vio/vio_priv.h +++ b/vio/vio_priv.h @@ -49,6 +49,7 @@ int vio_close_shared_memory(Vio * vio); #endif void vio_timeout(Vio *vio,uint which, uint timeout); +my_bool vio_buff_has_data(Vio *vio); #ifdef HAVE_OPENSSL #include "my_net.h" /* needed because of struct in_addr */ @@ -62,5 +63,7 @@ void vio_ssl_delete(Vio *vio); int vio_ssl_blocking(Vio *vio, my_bool set_blocking_mode, my_bool *old_mode); +my_bool vio_ssl_has_data(Vio *vio); + #endif /* HAVE_OPENSSL */ #endif /* VIO_PRIV_INCLUDED */ |