diff options
| author | unknown <lars@mysql.com> | 2005-07-13 02:13:04 +0200 |
|---|---|---|
| committer | unknown <lars@mysql.com> | 2005-07-13 02:13:04 +0200 |
| commit | 8daa1c422927964741c2977aea50567558d5f607 (patch) | |
| tree | 288cefd45b67649d427ee7a8a02969119055a4a4 /include | |
| parent | 1c8ef0cbd025557fc34f02d9a8cc99a392579141 (diff) | |
| parent | 73fd169d0215700583f335c6e42243e3fa1553c4 (diff) | |
| download | mariadb-git-8daa1c422927964741c2977aea50567558d5f607.tar.gz | |
Merge mysql.com:/home/bkroot/mysql-4.1
into mysql.com:/home/bk/mysql-5.0
BitKeeper/etc/config:
Auto merged
include/my_global.h:
Auto merged
sql/des_key_file.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/net_serv.cc:
Auto merged
vio/vio.c:
Auto merged
vio/viosocket.c:
Auto merged
sql/log.cc:
Manual merge
sql/slave.cc:
Manual merge
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/my_global.h b/include/my_global.h index bb1ab71fa70..61850931a8e 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -830,7 +830,7 @@ typedef off_t os_off_t; #define socket_errno WSAGetLastError() #define SOCKET_EINTR WSAEINTR #define SOCKET_EAGAIN WSAEINPROGRESS -#define SOCKET_EWOULDBLOCK WSAEINPROGRESS +#define SOCKET_EWOULDBLOCK WSAEWOULDBLOCK #define SOCKET_ENFILE ENFILE #define SOCKET_EMFILE EMFILE #elif defined(OS2) |