bk commit into 4.0 tree (SergeyV:1.2139) BUG#5588

[sergeyv]

Below is the list of changes that have just been committed into a local
4.0 repository of sergeyv. When sergeyv does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2139 05/08/26 17:31:51 SergeyV@selena. +2 -0
  Fixes bug #5588. vio_should_retry function is extended to detect timeout 
  properly on win32.

  vio/viosocket.c
    1.22 05/08/26 17:31:48 SergeyV@selena. +1 -1
    vio_should_retry function is extended to detect timeout properly on win32

  include/my_global.h
    1.73 05/08/26 17:31:48 SergeyV@selena. +3 -0
    Added Win32 specific socket timeout error code.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	SergeyV
# Host:	selena.
# Root:	H:/MYSQL/src/mysql-4.0-5588

--- 1.72/include/my_global.h	2005-06-08 20:07:23 +04:00
+++ 1.73/include/my_global.h	2005-08-26 17:31:48 +04:00
@@ -760,6 +760,7 @@
 #define socket_errno	WSAGetLastError()
 #define SOCKET_EINTR	WSAEINTR
 #define SOCKET_EAGAIN	WSAEINPROGRESS
+#define SOCKET_ETIMEDOUT WSAETIMEDOUT
 #define SOCKET_EWOULDBLOCK WSAEINPROGRESS
 #define SOCKET_ENFILE	ENFILE
 #define SOCKET_EMFILE	EMFILE
@@ -767,6 +768,7 @@
 #define socket_errno	sock_errno()
 #define SOCKET_EINTR	SOCEINTR
 #define SOCKET_EAGAIN	SOCEINPROGRESS
+#define SOCKET_ETIMEDOUT SOCKET_EAGAIN
 #define SOCKET_EWOULDBLOCK SOCEWOULDBLOCK
 #define SOCKET_ENFILE	SOCENFILE
 #define SOCKET_EMFILE	SOCEMFILE
@@ -776,6 +778,7 @@
 #define closesocket(A)	close(A)
 #define SOCKET_EINTR	EINTR
 #define SOCKET_EAGAIN	EAGAIN
+#define SOCKET_ETIMEDOUT SOCKET_EAGAIN
 #define SOCKET_EWOULDBLOCK EWOULDBLOCK
 #define SOCKET_ENFILE	ENFILE
 #define SOCKET_EMFILE	EMFILE

--- 1.21/vio/viosocket.c	2005-02-15 15:42:11 +03:00
+++ 1.22/vio/viosocket.c	2005-08-26 17:31:48 +04:00
@@ -212,7 +212,7 @@
 {
   int en = socket_errno;
   return (en == SOCKET_EAGAIN || en == SOCKET_EINTR ||
-	  en == SOCKET_EWOULDBLOCK);
+	  en == SOCKET_EWOULDBLOCK || en == SOCKET_ETIMEDOUT);
 }