diff options
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. */ |