diff options
| author | unknown <ndbdev@dl145c.mysql.com> | 2005-09-13 05:33:11 +0200 |
|---|---|---|
| committer | unknown <ndbdev@dl145c.mysql.com> | 2005-09-13 05:33:11 +0200 |
| commit | 0260e3dcc16544d73ae2a3e8996fa97ad5d288dd (patch) | |
| tree | dc1114386c562d2cbb719f0a1bca93f08a3afefe /include/my_global.h | |
| parent | 54e99aa58e826f15da7b8f8c071d02960c37a210 (diff) | |
| parent | b50eb4cd42d2d5073afb2af5af8b19c825a9cca1 (diff) | |
| download | mariadb-git-0260e3dcc16544d73ae2a3e8996fa97ad5d288dd.tar.gz | |
Merge
configure.in:
Auto merged
client/mysqltest.c:
Auto merged
include/my_global.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
storage/ndb/src/ndbapi/SignalSender.cpp:
Auto merged
sql/sql_table.cc:
SCCS merged
Diffstat (limited to 'include/my_global.h')
| -rw-r--r-- | include/my_global.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/my_global.h b/include/my_global.h index d240c5519d6..9a485542cc0 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -922,6 +922,7 @@ typedef off_t os_off_t; #define socket_errno WSAGetLastError() #define SOCKET_EINTR WSAEINTR #define SOCKET_EAGAIN WSAEINPROGRESS +#define SOCKET_ETIMEDOUT WSAETIMEDOUT #define SOCKET_EWOULDBLOCK WSAEWOULDBLOCK #define SOCKET_ENFILE ENFILE #define SOCKET_EMFILE EMFILE @@ -929,6 +930,7 @@ typedef off_t os_off_t; #define socket_errno sock_errno() #define SOCKET_EINTR SOCEINTR #define SOCKET_EAGAIN SOCEINPROGRESS +#define SOCKET_ETIMEDOUT SOCKET_EINTR #define SOCKET_EWOULDBLOCK SOCEWOULDBLOCK #define SOCKET_ENFILE SOCENFILE #define SOCKET_EMFILE SOCEMFILE @@ -938,6 +940,7 @@ typedef off_t os_off_t; #define closesocket(A) close(A) #define SOCKET_EINTR EINTR #define SOCKET_EAGAIN EAGAIN +#define SOCKET_ETIMEDOUT SOCKET_EINTR #define SOCKET_EWOULDBLOCK EWOULDBLOCK #define SOCKET_ENFILE ENFILE #define SOCKET_EMFILE EMFILE |