database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge pilot.mysql.com:/home/msvensson/mysql/bug22943/my50-bug22943

Browse Source 
into  pilot.mysql.com:/home/msvensson/mysql/bug22943/my51-bug22943
This commit is contained in:
msvensson@pilot.mysql.com
2007-01-29 14:35:09 +01:00
parent df4cfc0bc1 007d170ad2
commit 719a8f5896
9 changed files with 72 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
sql/net_serv.cc
View File

@ -609,7 +609,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, 1, net->write_timeout);
/* Write timeout is set in net_set_write_timeout */
#endif /* NO_ALARM */
pos=(char*) packet; end=pos+len;
@ -802,7 +802,7 @@ my_real_read(NET *net, ulong *complen)
if (net_blocking)
thr_alarm(&alarmed,net->read_timeout,&alarm_buff);
#else
vio_timeout(net->vio, 0, net->read_timeout);
/* Read timeout is set in net_set_read_timeout */
#endif /* NO_ALARM */
pos = net->buff + net->where_b; /* net->packet -4 */
@ -1113,3 +1113,26 @@ my_net_read(NET *net)
return len;
}
void net_set_read_timeout(NET *net, uint timeout)
{
DBUG_ENTER("net_set_read_timeout");
DBUG_PRINT("enter", ("timeout: %d", timeout));
net->read_timeout= timeout;
#ifdef NO_ALARM
vio_timeout(net->vio, 0, timeout);
#endif
DBUG_VOID_RETURN;
}
void net_set_write_timeout(NET *net, uint timeout)
{
DBUG_ENTER("net_set_write_timeout");
DBUG_PRINT("enter", ("timeout: %d", timeout));
net->write_timeout= timeout;
#ifdef NO_ALARM
vio_timeout(net->vio, 1, timeout);
#endif
DBUG_VOID_RETURN;
}