diff options
| author | monty@narttu.mysql.fi <> | 2003-08-27 02:51:39 +0300 |
|---|---|---|
| committer | monty@narttu.mysql.fi <> | 2003-08-27 02:51:39 +0300 |
| commit | 66b160c25377903737173b1b351ce6e275415c5e (patch) | |
| tree | df46d43bd0139e95a2e8a1f4acac68f2de3c484f /sql/net_serv.cc | |
| parent | f5a134ba561be8140a0d85f23b132b2df6348f70 (diff) | |
| download | mariadb-git-66b160c25377903737173b1b351ce6e275415c5e.tar.gz | |
vio ssl structure renames (to get rid of ending _)
Added TCP/IP read/write timeout for windows
Check on windows if second server is started with same TCP/IP port
Diffstat (limited to 'sql/net_serv.cc')
| -rw-r--r-- | sql/net_serv.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/net_serv.cc b/sql/net_serv.cc index 8f0d659daf2..18dadf24efa 100644 --- a/sql/net_serv.cc +++ b/sql/net_serv.cc @@ -434,6 +434,7 @@ net_real_write(NET *net,const char *packet,ulong len) thr_alarm(&alarmed,(uint) net->write_timeout,&alarm_buff); #else alarmed=0; + vio_timeout(net->vio, net->write_timeout); #endif /* NO_ALARM */ pos=(char*) packet; end=pos+len; @@ -623,6 +624,8 @@ my_real_read(NET *net, ulong *complen) #ifndef NO_ALARM if (net_blocking) thr_alarm(&alarmed,net->read_timeout,&alarm_buff); +#else + vio_timeout(net->vio, net->read_timeout); #endif /* NO_ALARM */ pos = net->buff + net->where_b; /* net->packet -4 */ |