diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-06-28 16:17:21 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-06-28 16:17:21 +0200 |
| commit | 45cabf10175da1ae2d158ea17ccd6e19f461d6f4 (patch) | |
| tree | 7872c2d7c60fc7707e504bdcbd2c8b7bd9f9f43e /sql/handler.cc | |
| parent | 8ca18294d59e4df82dacba69f9853e568ab2e0eb (diff) | |
| download | mariadb-git-45cabf10175da1ae2d158ea17ccd6e19f461d6f4.tar.gz | |
MDEV-16615 ASAN SEGV in handler::print_error or server crash after error upon CREATE TABLE
table->in_use is not always set and a KILL signal can arrive anytime.
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index 35b0814ef79..9c319b995da 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -3413,8 +3413,8 @@ void handler::print_error(int error, myf errflag) break; case HA_ERR_ABORTED_BY_USER: { - DBUG_ASSERT(table->in_use->killed); - table->in_use->send_kill_message(); + DBUG_ASSERT(ha_thd()->killed); + ha_thd()->send_kill_message(); DBUG_VOID_RETURN; } case HA_ERR_WRONG_MRG_TABLE_DEF: |