diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2022-09-30 12:29:24 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2022-09-30 12:29:24 +0200 |
| commit | 194cc3680593cad3856d112638e858ddc6928dff (patch) | |
| tree | a4e8dad968ae51ae2709e68b8319b6000ca9f09a /sql/sql_class.cc | |
| parent | 8833c24c61ea26661d9640d26ed0934169ac361b (diff) | |
| parent | e29fb956145cfa1f4f8c41cafcddea36a20b23aa (diff) | |
| download | mariadb-git-194cc3680593cad3856d112638e858ddc6928dff.tar.gz | |
Merge branch '10.5' into 10.6
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 1ec447c7f27..961e1d0ae8e 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -451,6 +451,7 @@ void thd_storage_lock_wait(THD *thd, long long value) extern "C" void *thd_get_ha_data(const THD *thd, const struct handlerton *hton) { + DBUG_ASSERT(thd == current_thd || mysql_mutex_is_owner(&thd->LOCK_thd_data)); return thd->ha_data[hton->slot].ha_ptr; } @@ -1538,6 +1539,8 @@ void THD::cleanup(void) wsrep_client_thread= false; #endif /* WITH_WSREP */ + DEBUG_SYNC(this, "THD_cleanup_after_set_killed"); + mysql_ha_cleanup(this); locked_tables_list.unlock_locked_tables(this); |