Fix incorrect merge.

MariaDB · Aug 27, 2014 · 422b99e · 422b99e
1 parent 8cd0871
commit 422b99e
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 2 deletions.
diff --git 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)) {

diff --git 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)) {