branches/innodb+: Correct an error introduced in r736 of branches/fts

and merged in r2324:

ibuf_page(): Assert that recv_no_ibuf_operations == FALSE.

fil_io(): Check !recv_no_ibuf_operations before calling ibuf_page().

fil/fil0fil.c

@@ -4270,6 +4270,7 @@ fil_io(
 	} else if (is_log) {
 		mode = OS_AIO_LOG;
 	} else if (type == OS_FILE_READ
+		   && !recv_no_ibuf_operations
 		   && ibuf_page(space_id, zip_size, block_offset, NULL)) {
 		mode = OS_AIO_IBUF;
 	} else {

ibuf/ibuf0ibuf.c

@@ -999,7 +999,8 @@ ibuf_fixed_addr_page(
 }
 
 /***************************************************************************
-Checks if a page is a level 2 or 3 page in the ibuf hierarchy of pages. */
+Checks if a page is a level 2 or 3 page in the ibuf hierarchy of pages.
+Must not be called when recv_no_ibuf_operations==TRUE. */
 UNIV_INTERN
 ibool
 ibuf_page(
@@ -1017,6 +1018,8 @@ ibuf_page(
 	mtr_t	local_mtr;
 	page_t*	bitmap_page;
 
+	ut_ad(!recv_no_ibuf_operations);
+
 	if (ibuf_fixed_addr_page(space, zip_size, page_no)) {
 
 		return(TRUE);

include/ibuf0ibuf.h

@@ -197,7 +197,8 @@ ibuf_bitmap_page(
 			0 for uncompressed pages */
 	ulint	page_no);/* in: page number */
 /***************************************************************************
-Checks if a page is a level 2 or 3 page in the ibuf hierarchy of pages. */
+Checks if a page is a level 2 or 3 page in the ibuf hierarchy of pages.
+Must not be called when recv_no_ibuf_operations==TRUE. */
 UNIV_INTERN
 ibool
 ibuf_page(