Commit 5b772090 authored by unknown's avatar unknown

Update to new vio


include/violite.h:
  Fixed typo
libmysql/violite.c:
  Removed not used parameter
man/Makefile.am:
  Added new manual pages
sql/net_serv.cc:
  Sync with libmysql/net.c
parent 10074642
...@@ -70,7 +70,7 @@ my_bool vio_is_blocking( Vio* vio); ...@@ -70,7 +70,7 @@ my_bool vio_is_blocking( Vio* vio);
/* /*
* setsockopt TCP_NODELAY at IPPROTO_TCP level, when possible. * 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. * setsockopt SO_KEEPALIVE at SOL_SOCKET level, when possible.
*/ */
......
...@@ -128,7 +128,7 @@ int my_net_init(NET *net, Vio* vio) ...@@ -128,7 +128,7 @@ int my_net_init(NET *net, Vio* vio)
if (!(test_flags & TEST_BLOCKING)) if (!(test_flags & TEST_BLOCKING))
vio_blocking(vio, FALSE); vio_blocking(vio, FALSE);
#endif #endif
vio_fastsend(vio,TRUE); vio_fastsend(vio);
} }
return 0; return 0;
} }
...@@ -271,7 +271,7 @@ net_real_write(NET *net,const char *packet,ulong len) ...@@ -271,7 +271,7 @@ net_real_write(NET *net,const char *packet,ulong len)
int length; int length;
char *pos,*end; char *pos,*end;
thr_alarm_t alarmed; thr_alarm_t alarmed;
#if (!defined(__WIN__) && !defined(__EMX__)) #if !defined(__WIN__) && !defined(__EMX__)
ALARM alarm_buff; ALARM alarm_buff;
#endif #endif
uint retry_count=0; uint retry_count=0;
......
...@@ -265,11 +265,10 @@ vio_is_blocking(Vio * vio) ...@@ -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; int r=0;
DBUG_ENTER("vio_fastsend"); DBUG_ENTER("vio_fastsend");
DBUG_PRINT("enter", ("onoff:%d", (int) onoff));
#ifdef IPTOS_THROUGHPUT #ifdef IPTOS_THROUGHPUT
{ {
......
...@@ -17,6 +17,8 @@ ...@@ -17,6 +17,8 @@
## Process this file with automake to create Makefile.in ## 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)
...@@ -128,7 +128,7 @@ int my_net_init(NET *net, Vio* vio) ...@@ -128,7 +128,7 @@ int my_net_init(NET *net, Vio* vio)
if (!(test_flags & TEST_BLOCKING)) if (!(test_flags & TEST_BLOCKING))
vio_blocking(vio, FALSE); vio_blocking(vio, FALSE);
#endif #endif
vio_fastsend(vio,TRUE); vio_fastsend(vio);
} }
return 0; return 0;
} }
...@@ -271,7 +271,7 @@ net_real_write(NET *net,const char *packet,ulong len) ...@@ -271,7 +271,7 @@ net_real_write(NET *net,const char *packet,ulong len)
int length; int length;
char *pos,*end; char *pos,*end;
thr_alarm_t alarmed; thr_alarm_t alarmed;
#if !defined(__WIN__) #if !defined(__WIN__) && !defined(__EMX__)
ALARM alarm_buff; ALARM alarm_buff;
#endif #endif
uint retry_count=0; uint retry_count=0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment