diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-10-08 23:06:53 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-10-08 23:06:53 +0300 |
| commit | 151ffe886b4b21499471658fdf01ea8347287092 (patch) | |
| tree | 55514ef9d9476f69934416b453f6a4caed3a08a9 | |
| parent | 63c7276f365c4f00168d75e3a1d63bb959df1dc1 (diff) | |
| download | mariadb-git-151ffe886b4b21499471658fdf01ea8347287092.tar.gz | |
merge sql/violite.c with libmysql/violite.c
libmysql/violite.c:
cleanup
sql/violite.c:
merge with libmysql/violite.c
(These files 'should' be symlinked but..)
| -rw-r--r-- | libmysql/violite.c | 6 | ||||
| -rw-r--r-- | sql/violite.c | 7 |
2 files changed, 10 insertions, 3 deletions
diff --git a/libmysql/violite.c b/libmysql/violite.c index 51940552bb9..721e6c8d81c 100644 --- a/libmysql/violite.c +++ b/libmysql/violite.c @@ -161,7 +161,7 @@ int vio_read(Vio * vio, gptr buf, int size) { int r; DBUG_ENTER("vio_read"); - DBUG_PRINT("enter", ("sd=%d, buf=%p, size=%d", vio->sd, buf, size)); + DBUG_PRINT("enter", ("sd=%d size=%d", vio->sd, size)); #if defined( __WIN__) || defined(OS2) if (vio->type == VIO_TYPE_NAMEDPIPE) { @@ -195,7 +195,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)); + DBUG_PRINT("enter", ("sd=%d size=%d", vio->sd, size)); #if defined( __WIN__) || defined(OS2) if ( vio->type == VIO_TYPE_NAMEDPIPE) { @@ -310,7 +310,7 @@ int vio_keepalive(Vio* vio, my_bool set_keep_alive) int r=0; uint opt = 0; DBUG_ENTER("vio_keepalive"); - DBUG_PRINT("enter", ("sd=%d, set_keep_alive=%d", vio->sd, (int) + DBUG_PRINT("enter", ("sd=%d set_keep_alive=%d", vio->sd, (int) set_keep_alive)); if (vio->type != VIO_TYPE_NAMEDPIPE) { diff --git a/sql/violite.c b/sql/violite.c index d551b9b8632..721e6c8d81c 100644 --- a/sql/violite.c +++ b/sql/violite.c @@ -39,6 +39,13 @@ #include <sys/ioctl.h> #endif +#if !defined(MSDOS) && !defined(__WIN__) && !defined(HAVE_BROKEN_NETINET_INCLUDES) && !defined(__BEOS__) +#include <netinet/ip.h> +#if !defined(alpha_linux_port) +#include <netinet/tcp.h> +#endif +#endif + #if defined(__EMX__) || defined(OS2) #define ioctlsocket ioctl #endif /* defined(__EMX__) */ |