Skip to content

M
mariadb
Commit b197066c authored by Nirbhay Choubey's avatar Nirbhay Choubey
Browse files
Options

MDEV-6807: InnoDB: Assertion failure in file lock0lock.cc (lock != ctx->wait_lock) 

Merged patch for lp:1364840.
parent 9a57de86
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 6 deletions
storage/innobase/lock/lock0lock.cc
View file @ b197066c
...@@ -2122,9 +2122,6 @@ lock_rec_create( ...@@ -2122,9 +2122,6 @@ lock_rec_create(
return(lock); return(lock);
} }
trx_mutex_exit(c_lock->trx); 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 { } else {
HASH_INSERT(lock_t, hash, lock_sys->rec_hash, HASH_INSERT(lock_t, hash, lock_sys->rec_hash,
lock_rec_fold(space, page_no), lock); lock_rec_fold(space, page_no), lock);
......
storage/xtradb/lock/lock0lock.cc
View file @ b197066c
...@@ -2133,9 +2133,6 @@ lock_rec_create( ...@@ -2133,9 +2133,6 @@ lock_rec_create(
return(lock); return(lock);
} }
trx_mutex_exit(c_lock->trx); 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 { } else {
HASH_INSERT(lock_t, hash, lock_sys->rec_hash, HASH_INSERT(lock_t, hash, lock_sys->rec_hash,
lock_rec_fold(space, page_no), lock); lock_rec_fold(space, page_no), lock);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7