Skip to content
Permalink
Browse files

After-merge fix

Merge a part of commit 25af2a1.
This was forgotten in the
merge commit e41eb04.
  • Loading branch information...
dr-m committed Aug 29, 2019
1 parent e50b2bd commit d4246e25e5057167a32506e3bd823db3e1731aa0
Showing with 2 additions and 5 deletions.
  1. +2 −5 storage/innobase/include/trx0sys.h
@@ -644,11 +644,8 @@ class rw_trx_hash_t
{
mutex_enter(&element->mutex);
lf_hash_search_unpin(pins);
trx= element->trx;
if (!trx);
else if (UNIV_UNLIKELY(trx_id != trx->id))
trx= NULL;
else {
if ((trx= element->trx)) {
DBUG_ASSERT(trx_id == trx->id);
if (do_ref_count)
trx->reference();
ut_d(validate_element(trx));

0 comments on commit d4246e2

Please sign in to comment.
You can’t perform that action at this time.