Merge branch '10.1' of github.com:MariaDB/server into 10.1

2f6d63f0 · Sergei Petrunia · 2936fb12 · 3674c363 · 2f6d63f0 · 2f6d63f0
Commit 2f6d63f0 authored Apr 06, 2015 by Sergei Petrunia
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 14 deletions

storage/innobase/include/buf0buf.ic storage/innobase/include/buf0buf.ic +0 -7

storage/xtradb/include/buf0buf.ic storage/xtradb/include/buf0buf.ic +0 -7

No files found.
--- a/storage/innobase/include/buf0buf.ic
+++ b/storage/innobase/include/buf0buf.ic
@@ -275,13 +275,6 @@ buf_page_set_state(
 	}
 #endif /* UNIV_DEBUG */
 	bpage->state = state;
-#ifdef UNIV_DEBUG
-	if( buf_page_get_state(bpage) != state) {
-		fprintf(stderr, "InnoDB: Error: Requested state %d current state %d old_state %d\n",
-			state, buf_page_get_state(bpage), old_state);
-	}
-#endif
-	ut_ad(buf_page_get_state(bpage) == state);
 }

 /*********************************************************************//**

--- a/storage/xtradb/include/buf0buf.ic
+++ b/storage/xtradb/include/buf0buf.ic
@@ -279,13 +279,6 @@ buf_page_set_state(
 #endif /* UNIV_DEBUG */

 	bpage->state = state;
-#ifdef UNIV_DEBUG
-	if( buf_page_get_state(bpage) != state) {
-		fprintf(stderr, "InnoDB: Error: Requested state %d current state %d old_state %d\n",
-			state, buf_page_get_state(bpage), old_state);
-	}
-#endif
-	ut_ad(buf_page_get_state(bpage) == state);
 }

 /*********************************************************************//**