diff options
| author | monty@narttu.mysql.fi <> | 2003-06-05 15:21:10 +0300 |
|---|---|---|
| committer | monty@narttu.mysql.fi <> | 2003-06-05 15:21:10 +0300 |
| commit | 4851b571bb867e386b7378fef8978125398091ed (patch) | |
| tree | df7b979ba6ec0bc86dc957fa7477fd5432d9ef09 /sql/net_serv.cc | |
| parent | 9262cf2fb9980989abc51e85d34aac9d751fef8e (diff) | |
| parent | de0a3d303663be27ff888103af841fc9d9fb3589 (diff) | |
| download | mariadb-git-4851b571bb867e386b7378fef8978125398091ed.tar.gz | |
Merged fix for alarm on big blocks
Diffstat (limited to 'sql/net_serv.cc')
| -rw-r--r-- | sql/net_serv.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/net_serv.cc b/sql/net_serv.cc index a3bb2525f9d..a8bc559e3a0 100644 --- a/sql/net_serv.cc +++ b/sql/net_serv.cc @@ -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)) { 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) DBUG_RETURN(1); /* Can't setup, abort */ } |