diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-09-12 23:53:31 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-09-12 23:53:31 +0300 |
| commit | 76989cf55c016a9d8619f582f753444241a4d934 (patch) | |
| tree | 51a09b9e3466647e4386ab24f3c9aa89ff7a93b9 /libmysql/violite.c | |
| parent | a53e8ea0ac4f7d53297b7942febf04e02d8c3b54 (diff) | |
| download | mariadb-git-76989cf55c016a9d8619f582f753444241a4d934.tar.gz | |
OS2 patch
Docs/manual.texi:
Updated section of how to change the socket file.
Changelog for 3.23.43
include/merge.h:
Fixed typo
include/my_pthread.h:
Fixed bug for WIN32
include/myisam.h:
Fixed typo
include/nisam.h:
Fixed typo
sql/handler.h:
Fixed typo
sql/sql_table.cc:
Fixed typo
sql/unireg.cc:
F
Diffstat (limited to 'libmysql/violite.c')
| -rw-r--r-- | libmysql/violite.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/libmysql/violite.c b/libmysql/violite.c index aff4224e5a3..0d96c71969c 100644 --- a/libmysql/violite.c +++ b/libmysql/violite.c @@ -44,18 +44,10 @@ #endif /* defined(__EMX__) */ #if defined(MSDOS) || defined(__WIN__) -#ifdef __WIN__ -#undef errno -#undef EINTR -#undef EAGAIN -#define errno WSAGetLastError() -#define EINTR WSAEINTR -#define EAGAIN WSAEINPROGRESS -#endif /* __WIN__ */ #define O_NONBLOCK 1 /* For emulation of fcntl() */ #endif #ifndef EWOULDBLOCK -#define EWOULDBLOCK EAGAIN +#define SOCKET_EWOULDBLOCK SOCKET_EAGAIN #endif #ifndef __WIN__ @@ -327,8 +319,8 @@ int vio_keepalive(Vio* vio, my_bool set_keep_alive) my_bool vio_should_retry(Vio * vio __attribute__((unused))) { - int en = errno; - return en == EAGAIN || en == EINTR || en == EWOULDBLOCK; + int en = socket_errno; + return en == SOCKET_EAGAIN || en == SOCKET_EINTR || en == SOCKET_EWOULDBLOCK; } |