Correct a merge error (remove a bogus #ifdef)

5e7435c4 · Marko Mäkelä · 3afc9629 · 5e7435c4
Commit 5e7435c4 authored Nov 15, 2017 by Marko Mäkelä
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

storage/innobase/buf/buf0buf.cc storage/innobase/buf/buf0buf.cc +0 -2

No files found.
--- a/storage/innobase/buf/buf0buf.cc
+++ b/storage/innobase/buf/buf0buf.cc
@@ -4298,10 +4298,8 @@ buf_page_get_gen(
 		case BUF_GET_IF_IN_POOL_OR_WATCH:
 		case BUF_PEEK_IF_IN_POOL:
 		case BUF_EVICT_IF_IN_POOL:
-#ifdef UNIV_SYNC_DEBUG
 			ut_ad(!rw_lock_own(hash_lock, RW_LOCK_X));
 			ut_ad(!rw_lock_own(hash_lock, RW_LOCK_S));
-#endif /* UNIV_SYNC_DEBUG */
 			return(NULL);
 		}