database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-10-23 18:49:29 +03:00
Code Activity

Fix incorrect merge.

Browse Source
This commit is contained in:
Jan Lindström
2014-08-27 20:00:13 +03:00
parent 8cd08717f6
commit 422b99ed87
2 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
storage/innobase/lock/lock0lock.cc
View File

@@ -6072,7 +6072,6 @@ lock_rec_queue_validate(
}
ut_a(!lock_rec_other_has_expl_req(
mode, 0, 0, block, heap_no, lock->trx));
}
#endif /* WITH_WSREP */
} else if (lock_get_wait(lock) && !lock_rec_get_gap(lock)) {

1
storage/xtradb/lock/lock0lock.cc
View File

@@ -6122,7 +6122,6 @@ lock_rec_queue_validate(
}
ut_a(!lock_rec_other_has_expl_req(
mode, 0, 0, block, heap_no, lock->trx->id));
}
#endif /* WITH_WSREP */
} else if (lock_get_wait(lock) && !lock_rec_get_gap(lock)) {