diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-10-29 19:22:04 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-10-29 19:22:04 +0200 |
| commit | 1ebfa2af62246b98e17cd255a9ccd858151b355a (patch) | |
| tree | f9cf4670ebe96b46f8e0107acc31f7235ec4c554 /storage/innobase/trx/trx0trx.cc | |
| parent | dd9da61dcfd7f5e675ed876cf38886b29d0ddc57 (diff) | |
| parent | 64143741789a3e1c2bb8c6bf627eaec3751af0c6 (diff) | |
| download | mariadb-git-1ebfa2af62246b98e17cd255a9ccd858151b355a.tar.gz | |
Merge branch '10.6' into 10.7
Diffstat (limited to 'storage/innobase/trx/trx0trx.cc')
| -rw-r--r-- | storage/innobase/trx/trx0trx.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/storage/innobase/trx/trx0trx.cc b/storage/innobase/trx/trx0trx.cc index 491aacfd941..b7d41b23825 100644 --- a/storage/innobase/trx/trx0trx.cc +++ b/storage/innobase/trx/trx0trx.cc @@ -399,7 +399,8 @@ void trx_t::free() autoinc_locks= NULL; } - MEM_NOACCESS(&n_ref, sizeof n_ref); + MEM_NOACCESS(&skip_lock_inheritance_and_n_ref, + sizeof skip_lock_inheritance_and_n_ref); /* do not poison mutex */ MEM_NOACCESS(&id, sizeof id); MEM_NOACCESS(&state, sizeof state); @@ -499,6 +500,7 @@ inline void trx_t::release_locks() } lock.table_locks.clear(); + reset_skip_lock_inheritance(); id= 0; while (dict_table_t *table= UT_LIST_GET_FIRST(lock.evicted_tables)) { @@ -1132,8 +1134,8 @@ trx_finalize_for_fts( trx->fts_trx = NULL; } - -extern "C" void thd_decrement_pending_ops(MYSQL_THD); +extern "C" MYSQL_THD thd_increment_pending_ops(MYSQL_THD); +extern "C" void thd_decrement_pending_ops(MYSQL_THD); #include "../log/log0sync.h" @@ -1166,7 +1168,7 @@ sync: } completion_callback cb; - if ((cb.m_param = innodb_thd_increment_pending_ops(trx->mysql_thd))) + if ((cb.m_param = thd_increment_pending_ops(trx->mysql_thd))) { cb.m_callback = (void (*)(void *)) thd_decrement_pending_ops; log_write_up_to(lsn, flush, false, &cb); |