Fix a WITH_WSREP=OFF warning

87ee8563 · Marko Mäkelä · 4cad4239 · 87ee8563
Commit 87ee8563 authored Mar 29, 2018 by Marko Mäkelä
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

storage/innobase/lock/lock0lock.cc storage/innobase/lock/lock0lock.cc +5 -2

No files found.
--- a/storage/innobase/lock/lock0lock.cc
+++ b/storage/innobase/lock/lock0lock.cc
@@ -1983,8 +1983,11 @@ lock_rec_lock(
      /* Do nothing if the trx already has a strong enough lock on rec */
      if (!lock_rec_has_expl(mode, block, heap_no, trx))
      {
-        if (lock_t *c_lock= lock_rec_other_has_conflicting(mode, block,
+        if (
-                                                           heap_no, trx))
+#ifdef WITH_WSREP
+	    lock_t *c_lock=
+#endif
+	    lock_rec_other_has_conflicting(mode, block, heap_no, trx))
        {
          /*
            If another transaction has a non-gap conflicting