Browse Source

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
pull/11/merge
Jan Lindström 11 years ago
parent
commit
7474e7baa0
  1. 3
      storage/innobase/lock/lock0lock.cc
  2. 3
      storage/xtradb/lock/lock0lock.cc

3
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);

3
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);

Loading…
Cancel
Save