diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-10-30 17:23:53 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-10-30 17:23:53 +0100 |
| commit | 794f66513967891520ec432123dcff8270871b93 (patch) | |
| tree | da31ab80611c016e9dca9af28ffd65c4a838e2f5 /sql/item_func.cc | |
| parent | 14d43f4fa691e3af113195a3608f1fc401b85090 (diff) | |
| parent | 72eea39d4c4a8bcadccfdac457e61abc7b618ff8 (diff) | |
| download | mariadb-git-794f66513967891520ec432123dcff8270871b93.tar.gz | |
Merge branch '10.2' into 10.3
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index 43aeba9d56a..0c22d4ce23c 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -1626,8 +1626,6 @@ my_decimal *Item_func_div::decimal_op(my_decimal *decimal_value) null_value= 1; return 0; } - my_decimal_round(E_DEC_FATAL_ERROR, decimal_value, - decimals, FALSE, decimal_value); return decimal_value; } @@ -3879,6 +3877,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()) + break; if (error == ETIMEDOUT || error == ETIME) { /* Return error if timed out or connection is broken. */ |