MDEV-6807: InnoDB: Assertion failure in file lock0lock.cc (lock != ct…

…x->wait_lock) Merged patch for lp:1364840.
MariaDB · Oct 4, 2014 · b197066 · b197066
1 parent 9a57de8
commit b197066
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 6 deletions.
diff --git a/storage/innobase/lock/lock0lock.cc b/storage/innobase/lock/lock0lock.cc
@@ -2122,9 +2122,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
@@ -2133,9 +2133,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);