diff options
| author | unknown <SergeyV@selena.> | 2005-09-07 15:57:14 +0400 |
|---|---|---|
| committer | unknown <SergeyV@selena.> | 2005-09-07 15:57:14 +0400 |
| commit | 9142aa41a4a01275371dd2ff2d0c2f25e977b7f4 (patch) | |
| tree | bcf60553d2cda3c381a8cd81327d8f8cbfd032f9 /vio/vio_priv.h | |
| parent | 3f9348ac38aecbcbc07375061a3808385bc2b443 (diff) | |
| download | mariadb-git-9142aa41a4a01275371dd2ff2d0c2f25e977b7f4.tar.gz | |
Fixes bug #5588. Additions after merge from 4.0.
sql-common/client.c:
Fixes bug #5588. checks if operation was timed out.
vio/vio.c:
Added vio_was_interrupted() function references to detect timed out
operation properly on win32.
vio/vio_priv.h:
Added vio_ssl_was_interrupted() function that detects timed out
operation properly on win32.
vio/viosocket.c:
Minor changes to follow up the coding standard.
vio/viossl.c:
Added vio_ssl_was_interrupted() function that detects timed out
operation properly on win32.
Diffstat (limited to 'vio/vio_priv.h')
| -rw-r--r-- | vio/vio_priv.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/vio/vio_priv.h b/vio/vio_priv.h index 3a75a08021d..c1c78cc6efa 100644 --- a/vio/vio_priv.h +++ b/vio/vio_priv.h @@ -39,6 +39,8 @@ int vio_ssl_fastsend(Vio *vio); int vio_ssl_keepalive(Vio *vio, my_bool onoff); /* Whenever we should retry the last read/write operation. */ my_bool vio_ssl_should_retry(Vio *vio); +/* Check that operation was timed out */ +my_bool vio_ssl_was_interrupted(Vio *vio); /* When the workday is over... */ int vio_ssl_close(Vio *vio); /* Return last error number */ |