Commit 72764b2f authored by Marko Mäkelä's avatar Marko Mäkelä

Cleanup: Remove a workaround

Since commit 1bd681c8
dict_stats_exec_sql() is no longer playing dirty tricks.
We can remove the workaround in lock_release().
parent e8ba6426
...@@ -3791,11 +3791,7 @@ void lock_release(trx_t *trx) ...@@ -3791,11 +3791,7 @@ void lock_release(trx_t *trx)
#if defined SAFE_MUTEX && defined UNIV_DEBUG #if defined SAFE_MUTEX && defined UNIV_DEBUG
std::set<table_id_t> to_evict; std::set<table_id_t> to_evict;
if (innodb_evict_tables_on_commit_debug && !trx->is_recovered) if (innodb_evict_tables_on_commit_debug && !trx->is_recovered)
# if 1 /* if dict_stats_exec_sql() were not playing dirty tricks */
if (!dict_sys.mutex_is_locked())
# else /* this would be more proper way to do it */
if (!trx->dict_operation_lock_mode && !trx->dict_operation) if (!trx->dict_operation_lock_mode && !trx->dict_operation)
# endif
for (const auto& p: trx->mod_tables) for (const auto& p: trx->mod_tables)
if (!p.first->is_temporary()) if (!p.first->is_temporary())
to_evict.emplace(p.first->id); to_evict.emplace(p.first->id);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment