database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Update to new vio

Browse Source
This commit is contained in:
monty@donna.mysql.com
2000-12-31 12:47:29 +02:00
parent 5c18942398
commit 74aefb4deb
5 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/violite.h
View File

@ -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.
*/ */

4
libmysql/net.c
View File

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

3
libmysql/violite.c
View File

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

6
man/Makefile.am
View File

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

4
sql/net_serv.cc
View File

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