diff options
| author | monty@donna.mysql.com <> | 2000-11-28 04:47:47 +0200 |
|---|---|---|
| committer | monty@donna.mysql.com <> | 2000-11-28 04:47:47 +0200 |
| commit | 74e7ffe9872e74f3ac1ae4e93a2ef1b0d2c97c03 (patch) | |
| tree | e3d40dd7c6a7e86bd2388da19d59d5a372bf7bb8 /sql/violite.c | |
| parent | ad2e43c7d6f4b7bbe5b92830ef11856c7d18b6b5 (diff) | |
| download | mariadb-git-74e7ffe9872e74f3ac1ae4e93a2ef1b0d2c97c03.tar.gz | |
New thr_alarm struct for better integration with OS2
Run bootstrap in separate thread
Fix bug in FLUSH TABLES table_name
Diffstat (limited to 'sql/violite.c')
| -rw-r--r-- | sql/violite.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/violite.c b/sql/violite.c index 4efda9f3b90..253ef7bb468 100644 --- a/sql/violite.c +++ b/sql/violite.c @@ -38,8 +38,7 @@ #if defined(__EMX__) #include <sys/ioctl.h> -#define ioctlsocket(A,B,C) ioctl((A),(B),(void *)(C),sizeof(*(C))) -#undef HAVE_FCNTL +#define ioctlsocket ioctl #endif /* defined(__EMX__) */ #if defined(MSDOS) || defined(__WIN__) @@ -111,7 +110,7 @@ Vio *vio_new(my_socket sd, enum enum_vio_type type, my_bool localhost) #else /* !defined(__WIN__) && !defined(__EMX__) */ { /* set to blocking mode by default */ - ulong arg=0; + ulong arg=0, r; r = ioctlsocket(vio->sd,FIONBIO,(void*) &arg, sizeof(arg)); } #endif |