merge from mysql-5.1

7ef599d9 · Inaam Rana · 08d1f061 · 3d3b8d7b · 7ef599d9
Commit 7ef599d9 authored Dec 01, 2011 by Inaam Rana
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

storage/innobase/buf/buf0buf.c storage/innobase/buf/buf0buf.c +4 -2

No files found.
--- a/storage/innobase/buf/buf0buf.c
+++ b/storage/innobase/buf/buf0buf.c
@@ -1230,8 +1230,10 @@ buf_pool_free_instance(
 		ut_ad(bpage->in_LRU_list);

 		if (state != BUF_BLOCK_FILE_PAGE) {
-			/* We must not have any dirty block. */
-			ut_ad(state == BUF_BLOCK_ZIP_PAGE);
+			/* We must not have any dirty block except
+			when doing a fast shutdown. */
+			ut_ad(state == BUF_BLOCK_ZIP_PAGE
+			      || srv_fast_shutdown == 2);
 			buf_page_free_descriptor(bpage);
 		}