Commit 4851b571 authored by monty@narttu.mysql.fi's avatar monty@narttu.mysql.fi

Merged fix for alarm on big blocks

parents 9262cf2f de0a3d30
...@@ -565,7 +565,7 @@ static my_bool my_net_skip_rest(NET *net, uint32 remain, thr_alarm_t *alarmed, ...@@ -565,7 +565,7 @@ static my_bool my_net_skip_rest(NET *net, uint32 remain, thr_alarm_t *alarmed,
if (!thr_alarm_in_use(alarmed)) if (!thr_alarm_in_use(alarmed))
{ {
my_bool old_mode; my_bool old_mode;
if (!thr_alarm(alarmed,net->read_timeout, alarm_buff) || if (thr_alarm(alarmed,net->read_timeout, alarm_buff) ||
vio_blocking(net->vio, TRUE, &old_mode) < 0) vio_blocking(net->vio, TRUE, &old_mode) < 0)
DBUG_RETURN(1); /* Can't setup, abort */ DBUG_RETURN(1); /* Can't setup, abort */
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment