Fix incorrect merge.

422b99ed · Jan Lindström · 8cd08717 · 422b99ed · 422b99ed
Commit 422b99ed authored Aug 27, 2014 by Jan Lindström
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

storage/innobase/lock/lock0lock.cc storage/innobase/lock/lock0lock.cc +0 -1

storage/xtradb/lock/lock0lock.cc storage/xtradb/lock/lock0lock.cc +0 -1

No files found.
--- a/storage/innobase/lock/lock0lock.cc
+++ b/storage/innobase/lock/lock0lock.cc
@@ -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)) {

--- a/storage/xtradb/lock/lock0lock.cc
+++ b/storage/xtradb/lock/lock0lock.cc
@@ -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)) {