Update to new vio

include/violite.h

@@ -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

@@ -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

@@ -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

@@ -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)
+EXTRA_DIST =	$(man_MANS)

sql/net_serv.cc

@@ -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;