diff options
| author | unknown <rburnett@bk-internal.mysql.com> | 2005-05-06 15:15:48 +0200 |
|---|---|---|
| committer | unknown <rburnett@bk-internal.mysql.com> | 2005-05-06 15:15:48 +0200 |
| commit | 4576776010d65e7f7277604ca47bf65860ee6744 (patch) | |
| tree | fc2e2665a3d8e35e9aabc5e2fe3eb3c34d0c85d3 /sql/net_serv.cc | |
| parent | 0baed276c312dd2e277e0e029f290510c6bdd4d9 (diff) | |
| parent | 6b819860e5fa83f1ba7c6025df8e227775bb1a1b (diff) | |
| download | mariadb-git-4576776010d65e7f7277604ca47bf65860ee6744.tar.gz | |
Merge bk-internal.mysql.com:/users/rburnett/bug9721
into bk-internal.mysql.com:/users/rburnett/mysql-5.0
BitKeeper/etc/logging_ok:
auto-union
include/violite.h:
Auto merged
sql/net_serv.cc:
Auto merged
vio/viosocket.c:
Auto merged
vio/viossl.c:
Auto merged
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 4fbbeedb812..44539ec2d74 100644 --- a/sql/net_serv.cc +++ b/sql/net_serv.cc @@ -495,7 +495,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); + vio_timeout(net->vio, 1, net->write_timeout); #endif /* NO_ALARM */ pos=(char*) packet; end=pos+len; @@ -688,7 +688,7 @@ my_real_read(NET *net, ulong *complen) if (net_blocking) thr_alarm(&alarmed,net->read_timeout,&alarm_buff); #else - vio_timeout(net->vio, net->read_timeout); + vio_timeout(net->vio, 0, net->read_timeout); #endif /* NO_ALARM */ pos = net->buff + net->where_b; /* net->packet -4 */ |