diff options
| author | monty@hundin.mysql.fi <> | 2002-04-29 12:24:14 +0300 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2002-04-29 12:24:14 +0300 |
| commit | 9d0f8a1b5f500816634faae9568c19106ba9962f (patch) | |
| tree | 5622a481c28e42581626ad05e58e4afaab88bd0f /vio | |
| parent | 36f81cb5f06202b02500e72e37672f2dc000c5b0 (diff) | |
| download | mariadb-git-9d0f8a1b5f500816634faae9568c19106ba9962f.tar.gz | |
Fixed that enable-reads-from-master and repl-parse-query works in option files.
Fixed slowdown problem on win98
Fixed syntax for ALTER TABLE .. RENAME
Diffstat (limited to 'vio')
| -rw-r--r-- | vio/vio.c | 2 | ||||
| -rw-r--r-- | vio/viosocket.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/vio/vio.c b/vio/vio.c index 62814e50240..67cb7ec95cd 100644 --- a/vio/vio.c +++ b/vio/vio.c @@ -96,7 +96,7 @@ Vio *vio_new(my_socket sd, enum enum_vio_type type, my_bool localhost) sprintf(vio->desc, (vio->type == VIO_TYPE_SOCKET ? "socket (%d)" : "TCP/IP (%d)"), vio->sd); -#if !defined(___WIN__) && !defined(__EMX__) +#if !defined(___WIN__) && !defined(__EMX__) && !defined(OS2) #if !defined(NO_FCNTL_NONBLOCK) vio->fcntl_mode = fcntl(sd, F_GETFL); #elif defined(HAVE_SYS_IOCTL_H) /* hpux */ diff --git a/vio/viosocket.c b/vio/viosocket.c index 14b4305b95a..85e239f29ac 100644 --- a/vio/viosocket.c +++ b/vio/viosocket.c @@ -87,7 +87,7 @@ int vio_write(Vio * vio, const gptr buf, int size) int r; DBUG_ENTER("vio_write"); DBUG_PRINT("enter", ("sd=%d, buf=%p, size=%d", vio->sd, buf, size)); -#ifdef __WIN__ +#if defined( __WIN__) if ( vio->type == VIO_TYPE_NAMEDPIPE) { DWORD length; @@ -95,7 +95,7 @@ int vio_write(Vio * vio, const gptr buf, int size) DBUG_RETURN(-1); DBUG_RETURN(length); } - r = send(vio->sd, buf, size,0); + r = send(vio->sd, buf, size, 0); #else r = write(vio->sd, buf, size); #endif /* __WIN__ */ |