After-merge fix

Merge a part of commit 25af2a1. This was forgotten in the merge commit e41eb04.
MariaDB · Aug 29, 2019 · d4246e2 · d4246e2
1 parent e50b2bd
commit d4246e2
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/storage/innobase/include/trx0sys.h b/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));