Commit 74aefb4d authored by monty@donna.mysql.com's avatar monty@donna.mysql.com
Browse files

Update to new vio

parent 5c189423

include/violite.h

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ my_bool vio_is_blocking( Vio* vio); 
/*

 * setsockopt TCP_NODELAY at IPPROTO_TCP level, when possible.

 */

  int		vio_fastsend(		Vio*		vio,);

  int		vio_fastsend(		Vio*		vio);

/*

 * setsockopt SO_KEEPALIVE at SOL_SOCKET level, when possible.

 */

libmysql/net.c

+2 −2
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ int my_net_init(NET *net, Vio* vio) 
    if (!(test_flags & TEST_BLOCKING))

      vio_blocking(vio, FALSE);

#endif

    vio_fastsend(vio,TRUE);

    vio_fastsend(vio);

  }

  return 0;

}
@@ -271,7 +271,7 @@ net_real_write(NET *net,const char *packet,ulong len) 
  int length;

  char *pos,*end;

  thr_alarm_t alarmed;

#if (!defined(__WIN__) && !defined(__EMX__))

#if !defined(__WIN__) && !defined(__EMX__)

  ALARM alarm_buff;

#endif

  uint retry_count=0;

libmysql/violite.c

+1 −2
Original line number Diff line number Diff line
@@ -265,11 +265,10 @@ vio_is_blocking(Vio * vio) 
}





int vio_fastsend(Vio * vio __attribute__((unused)), my_bool onoff)

int vio_fastsend(Vio * vio __attribute__((unused)))

{

  int r=0;

  DBUG_ENTER("vio_fastsend");

  DBUG_PRINT("enter", ("onoff:%d", (int) onoff));



#ifdef IPTOS_THROUGHPUT

  {

man/Makefile.am

+4 −2
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 


## Process this file with automake to create Makefile.in



man_MANS =		mysql.1

man_MANS =	mysql.1 isamchk.1 isamlog.1 mysql_zap.1 mysqlaccess.1 \

		mysqladmin.1 mysqld.1 mysqld_multi.1 mysqldump.1 mysqlshow.1 \

		perror.1 replace.1 safe_mysqld.1



EXTRA_DIST =	$(man_MANS)

sql/net_serv.cc

+2 −2
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ int my_net_init(NET *net, Vio* vio) 
    if (!(test_flags & TEST_BLOCKING))

      vio_blocking(vio, FALSE);

#endif

    vio_fastsend(vio,TRUE);

    vio_fastsend(vio);

  }

  return 0;

}
@@ -271,7 +271,7 @@ net_real_write(NET *net,const char *packet,ulong len) 
  int length;

  char *pos,*end;

  thr_alarm_t alarmed;

#if !defined(__WIN__) 

#if !defined(__WIN__) && !defined(__EMX__)

  ALARM alarm_buff;

#endif

  uint retry_count=0;