mirror of
https://github.com/MariaDB/server.git
synced 2026-05-02 13:15:32 +02:00
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 Docs/manual.texi: changelog libmysql/libmysql.c: Fixed that enable-reads-from-master and repl-parse-query works in option files. myisam/ft_boolean_search.c: Portability fixes mysys/my_thr_init.c: cleanup sql/sql_base.cc: Fixed slowdown problem on win98 sql/sql_delete.cc: Removed compiler warnings sql/sql_insert.cc: Removed compiler warnings sql/sql_update.cc: Removed compiler warnings sql/sql_yacc.yy: Fixed syntax for ALTER TABLE .. RENAME vio/vio.c: Added test of OS2 vio/viosocket.c: cleanup
This commit is contained in:
parent
2ddd3d219d
commit
4c76a1c896
11 changed files with 45 additions and 29 deletions
|
|
@ -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 */
|
||||
|
|
|
|||
|
|
@ -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__ */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue