From 7474e7baa06505c015d0d327ae923add76306a32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Lindstr=C3=B6m?= Date: Thu, 2 Oct 2014 21:01:57 +0300 Subject: [PATCH] MDEV-6807: InnoDB: Assertion failure in file lock0lock.cc (lock != ctx->wait_lock) References: lp:1364840 lp:1280896 - reverted a part of fix for lp:1280896 (updating a unique key can cause parallel applying to hang ) in revision #4105. This "BF (brute force) lock skipping" caused regression which surfaced in randgen test for bug lp:1364840 --- storage/innobase/lock/lock0lock.cc | 3 --- storage/xtradb/lock/lock0lock.cc | 3 --- 2 files changed, 6 deletions(-) diff --git a/storage/innobase/lock/lock0lock.cc b/storage/innobase/lock/lock0lock.cc index bf665eb1955..61da49d1345 100644 --- a/storage/innobase/lock/lock0lock.cc +++ b/storage/innobase/lock/lock0lock.cc @@ -2079,9 +2079,6 @@ lock_rec_create( return(lock); } trx_mutex_exit(c_lock->trx); - } else if (wsrep_thd_is_BF(trx->mysql_thd, FALSE)) { - HASH_PREPEND(lock_t, hash, lock_sys->rec_hash, - lock_rec_fold(space, page_no), lock); } else { HASH_INSERT(lock_t, hash, lock_sys->rec_hash, lock_rec_fold(space, page_no), lock); diff --git a/storage/xtradb/lock/lock0lock.cc b/storage/xtradb/lock/lock0lock.cc index 8cf77e1ec82..018f6f9a69a 100644 --- a/storage/xtradb/lock/lock0lock.cc +++ b/storage/xtradb/lock/lock0lock.cc @@ -2090,9 +2090,6 @@ lock_rec_create( return(lock); } trx_mutex_exit(c_lock->trx); - } else if (wsrep_thd_is_BF(trx->mysql_thd, FALSE)) { - HASH_PREPEND(lock_t, hash, lock_sys->rec_hash, - lock_rec_fold(space, page_no), lock); } else { HASH_INSERT(lock_t, hash, lock_sys->rec_hash, lock_rec_fold(space, page_no), lock);