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 /sql/net_serv.cc | |
| 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
Diffstat (limited to 'sql/net_serv.cc')
| -rw-r--r-- | sql/net_serv.cc | 4 |
1 files changed, 2 insertions, 2 deletions
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; |