diff options
| author | monty@narttu.mysql.fi <> | 2003-06-05 12:00:06 +0300 |
|---|---|---|
| committer | monty@narttu.mysql.fi <> | 2003-06-05 12:00:06 +0300 |
| commit | aeb655e04cfea2a2d8543ef8cce00143f0b1e67d (patch) | |
| tree | e7cf72a5a0ceb492f3c19d1b821cc2ed178cb9f8 /sql/net_serv.cc | |
| parent | 8ad4a240d266eb73df0fd506a2de527a8cdfe7ac (diff) | |
| parent | cd3b680db00f52d7a502bf62513789f54b2dbcd0 (diff) | |
| download | mariadb-git-aeb655e04cfea2a2d8543ef8cce00143f0b1e67d.tar.gz | |
Merge with 3.23 to get fix for thr_alarm and big packets
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 79d9041bb6d..3d5055b4f24 100644 --- a/sql/net_serv.cc +++ b/sql/net_serv.cc @@ -523,7 +523,7 @@ static my_bool net_safe_read(NET *net, char *buff, uint32 length, if ((tmp=vio_read(net->vio,(char*) net->buff, length)) <= 0) { my_bool interrupted = vio_should_retry(net->vio); - if (!thr_got_alarm(&alarmed) && interrupted) + if (!thr_got_alarm(alarmed) && interrupted) { /* Probably in MIT threads */ if (retry_count++ < net->retry_count) continue; @@ -557,7 +557,7 @@ static my_bool my_net_skip_rest(NET *net, uint32 remain, thr_alarm_t *alarmed, DBUG_ENTER("my_net_skip_rest"); DBUG_PRINT("enter",("bytes_to_skip: %u", (uint) remain)); - if (!thr_alarm_in_use(&alarmed)) + if (!thr_alarm_in_use(alarmed)) { my_bool old_mode; if (!thr_alarm(alarmed,net->read_timeout, alarm_buff) || |