diff options
| author | unknown <monty@donna.mysql.com> | 2000-12-31 12:47:29 +0200 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2000-12-31 12:47:29 +0200 |
| commit | 5b7720900b6bda4b7fde3bbb8315552fa1422321 (patch) | |
| tree | e9f832de22a9250147d2158c05c4d5228c2d1f47 | |
| parent | 10074642b4bfe896121b4cb256529a3282cbd2da (diff) | |
| download | mariadb-git-5b7720900b6bda4b7fde3bbb8315552fa1422321.tar.gz | |
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
| -rw-r--r-- | include/violite.h | 2 | ||||
| -rw-r--r-- | libmysql/net.c | 4 | ||||
| -rw-r--r-- | libmysql/violite.c | 3 | ||||
| -rw-r--r-- | man/Makefile.am | 6 | ||||
| -rw-r--r-- | sql/net_serv.cc | 4 |
5 files changed, 10 insertions, 9 deletions
diff --git a/include/violite.h b/include/violite.h index 8b7c704bc4d..49df6994d53 100644 --- a/include/violite.h +++ b/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. */ diff --git a/libmysql/net.c b/libmysql/net.c index d8898facb26..34c2922da60 100644 --- a/libmysql/net.c +++ b/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; diff --git a/libmysql/violite.c b/libmysql/violite.c index 253ef7bb468..25ab5db31d2 100644 --- a/libmysql/violite.c +++ b/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 { diff --git a/man/Makefile.am b/man/Makefile.am index 9e5c4f707ef..52a69870fb1 100644 --- a/man/Makefile.am +++ b/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) diff --git a/sql/net_serv.cc b/sql/net_serv.cc index 8b0603473a6..34c2922da60 100644 --- a/sql/net_serv.cc +++ b/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; |