merge from ~mordred/percona-xtradb/fix-buf-buf, Fixed a compile problem with...

merge from ~mordred/percona-xtradb/fix-buf-buf, Fixed a compile problem with trying to send a buf_block_t* to a thing wanting

buf/buf0buf.c

@@ -1860,6 +1860,7 @@ buf_page_get_gen(
 	mtr_t*		mtr)	/* in: mini-transaction */
 {
 	buf_block_t*	block;
+	buf_page_t*	bpage= NULL;
 	ibool		accessed;
 	ulint		fix_type;
 	ibool		must_read;
@@ -1882,7 +1883,9 @@ loop:
 	//buf_pool_mutex_enter();
 
 	if (block) {
-		block_mutex = buf_page_get_mutex(block);
+		bpage = &block->page;
+
+		block_mutex = buf_page_get_mutex(bpage);
 		mutex_enter(block_mutex);
 
 		/* If the guess is a compressed page descriptor that
@@ -1911,7 +1914,8 @@ loop:
 		mutex_enter(&page_hash_mutex);
 		block = (buf_block_t*) buf_page_hash_get(space, offset);
 		if (block) {
-			block_mutex = buf_page_get_mutex(block);
+			bpage = &block->page;
+			block_mutex = buf_page_get_mutex(bpage);
 			mutex_enter(block_mutex);
 		}
 		mutex_exit(&page_hash_mutex);
@@ -1980,7 +1984,8 @@ wait_until_unfixed:
 
 		block = buf_LRU_get_free_block(0);
 		ut_a(block);
-		block_mutex = buf_page_get_mutex(block);
+                bpage = &block->page;
+		block_mutex = buf_page_get_mutex(bpage);
 
 		//buf_pool_mutex_enter();
 		mutex_enter(&flush_list_mutex);
@@ -2001,7 +2006,8 @@ wait_until_unfixed:
 				mutex_exit(block_mutex);
 
 				block = (buf_block_t*) hash_bpage;
-				block_mutex = buf_page_get_mutex(block);
+                		bpage = &block->page;
+				block_mutex = buf_page_get_mutex(bpage);
 
 				mutex_enter(block_mutex);
 				mutex_exit(&page_hash_mutex);