summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authormonty@donna.mysql.com <>2000-12-31 12:47:29 +0200
committermonty@donna.mysql.com <>2000-12-31 12:47:29 +0200
commit74aefb4deb262a0e34f5fa802e15ec6a5b9e0ff6 (patch)
treee9f832de22a9250147d2158c05c4d5228c2d1f47 /sql
parent5c18942398f6bb5554be1626dc07bd315fd08274 (diff)
downloadmariadb-git-74aefb4deb262a0e34f5fa802e15ec6a5b9e0ff6.tar.gz
Update to new vio
Diffstat (limited to 'sql')
-rw-r--r--sql/net_serv.cc4
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;