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.

1 files changed, 9 insertions, 0 deletions

diff --git a/vio/viossl.c b/vio/viossl.c
index 2f608209a53..a3a2e7190bd 100644
--- a/vio/viossl.c
+++ b/vio/viossl.c
@@ -184,6 +184,15 @@ vio_ssl_should_retry(Vio * vio __attribute__((unused)))
 }
 
 
+my_bool
+vio_ssl_was_interrupted(Vio *vio __attribute__((unused)))
+{
+  int en= socket_errno;
+  return (en == SOCKET_EAGAIN || en == SOCKET_EINTR ||
+	  en == SOCKET_EWOULDBLOCK || en == SOCKET_ETIMEDOUT);
+}
+
+
 int vio_ssl_close(Vio * vio)
 {
   int r;