Commit a88a9842 authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

merge sql/violite.c with libmysql/violite.c

parent 88e5ee01

libmysql/violite.c

+3 −3
Original line number Diff line number Diff line
@@ -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)

  {

sql/violite.c

+7 −0
Original line number Diff line number Diff line
@@ -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__) */