branches/zip:

buf_flush_buffered_writes(): Remove bogus assertion failure.

buf/buf0flu.c

@@ -265,8 +265,8 @@ buf_flush_buffered_writes(void)
                 }
 
 		if (!block->check_index_page_at_flush) {
-		} else if (page_is_comp(block->frame)
-				&& UNIV_UNLIKELY(!page_simple_validate_new(
+		} else if (page_is_comp(block->frame)) {
+			if (UNIV_UNLIKELY(!page_simple_validate_new(
 						block->frame))) {
 corrupted_page:
 				buf_page_print(block->frame);
@@ -277,9 +277,11 @@ corrupted_page:
 	"InnoDB: to be written to data file. We intentionally crash server\n"
 	"InnoDB: to prevent corrupt data from ending up in data\n"
 	"InnoDB: files.\n",
-			(ulong) block->offset, (ulong) block->space);
+					(ulong) block->offset,
+					(ulong) block->space);
 
 				ut_error;
+			}
 		} else if (UNIV_UNLIKELY(!page_simple_validate_old(
 						block->frame))) {