Skip to content

M
mariadb
Commit 422b99ed authored by Jan Lindström's avatar Jan Lindström
Browse files
Options

Fix incorrect merge.

parent 8cd08717
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 2 deletions
storage/innobase/lock/lock0lock.cc
View file @ 422b99ed
...@@ -6072,7 +6072,6 @@ lock_rec_queue_validate( ...@@ -6072,7 +6072,6 @@ lock_rec_queue_validate(
} }
ut_a(!lock_rec_other_has_expl_req( ut_a(!lock_rec_other_has_expl_req(
mode, 0, 0, block, heap_no, lock->trx)); mode, 0, 0, block, heap_no, lock->trx));
}
#endif /* WITH_WSREP */ #endif /* WITH_WSREP */
} else if (lock_get_wait(lock) && !lock_rec_get_gap(lock)) { } else if (lock_get_wait(lock) && !lock_rec_get_gap(lock)) {
......
storage/xtradb/lock/lock0lock.cc
View file @ 422b99ed
...@@ -6122,7 +6122,6 @@ lock_rec_queue_validate( ...@@ -6122,7 +6122,6 @@ lock_rec_queue_validate(
} }
ut_a(!lock_rec_other_has_expl_req( ut_a(!lock_rec_other_has_expl_req(
mode, 0, 0, block, heap_no, lock->trx->id)); mode, 0, 0, block, heap_no, lock->trx->id));
}
#endif /* WITH_WSREP */ #endif /* WITH_WSREP */
} else if (lock_get_wait(lock) && !lock_rec_get_gap(lock)) { } else if (lock_get_wait(lock) && !lock_rec_get_gap(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