diff options
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index 8a75d2c9946..e0137d08dfb 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -4017,6 +4017,8 @@ int Interruptible_wait::wait(mysql_cond_t *cond, mysql_mutex_t *mutex) timeout= m_abs_timeout; error= mysql_cond_timedwait(cond, mutex, &timeout); + if (m_thd->check_killed(TRUE)) + break; if (error == ETIMEDOUT || error == ETIME) { /* Return error if timed out or connection is broken. */ |