diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-09-18 09:11:38 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-09-18 12:34:49 +0200 |
| commit | 3d466b3c9b704e48bdffb9ed84852b9f3720b22b (patch) | |
| tree | 419643642043e78abf2481b21556ca958dca72b4 /sql/item_func.cc | |
| parent | f381e019b602951586e47458eb884924c0945e12 (diff) | |
| download | mariadb-git-bb-10.2-MDEV-23752.tar.gz | |
MDEV-23752 SHOW EXPLAIN FOR thd waits for sleepbb-10.2-MDEV-23752
call check_killed() periodically during sleep()
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index 9d588ce0eb1..98169c2c534 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -4059,7 +4059,8 @@ int Interruptible_wait::wait(mysql_cond_t *cond, mysql_mutex_t *mutex) if (error == ETIMEDOUT || error == ETIME) { /* Return error if timed out or connection is broken. */ - if (!cmp_timespec(timeout, m_abs_timeout) || !m_thd->is_connected()) + if (!cmp_timespec(timeout, m_abs_timeout) || !m_thd->is_connected() || + m_thd->check_killed()) break; } /* Otherwise, propagate status to the caller. */ |