branches/zip: btr_parse_page_reorganize(): Add parameter page_zip.

btr/btr0btr.c

@@ -986,7 +986,8 @@ btr_parse_page_reorganize(
 	byte*		end_ptr __attribute__((unused)),
 				/* in: buffer end */
 	dict_index_t*	index,	/* in: record descriptor */
-	page_t*		page,	/* in: page or NULL */
+	page_t*		page,	/* in/out: page to be reorganized, or NULL */
+	page_zip_des_t*	page_zip,/* in/out: compressed page, or NULL */
 	mtr_t*		mtr)	/* in: mtr or NULL */
 {
 	ut_ad(ptr && end_ptr);
@@ -994,8 +995,6 @@ btr_parse_page_reorganize(
 	/* The record is empty, except for the record initial part */
 
 	if (UNIV_LIKELY(page != NULL)) {
-		page_zip_des_t*	page_zip = buf_block_get_page_zip(
-						buf_block_align(page));
 		btr_page_reorganize_low(TRUE, page, page_zip, index, mtr);
 	}
 

include/btr0btr.h

@@ -346,7 +346,8 @@ btr_parse_page_reorganize(
 	byte*		ptr,	/* in: buffer */
 	byte*		end_ptr,/* in: buffer end */
 	dict_index_t*	index,	/* in: record descriptor */
-	page_t*		page,	/* in: page or NULL */
+	page_t*		page,	/* in/out: page to be reorganized, or NULL */
+	page_zip_des_t*	page_zip,/* in/out: compressed page, or NULL */
 	mtr_t*		mtr);	/* in: mtr or NULL */
 /******************************************************************
 Gets the number of pages in a B-tree. */

log/log0recv.c

@@ -839,7 +839,7 @@ recv_parse_or_apply_log_rec_body(
 				|| (ibool)!!page_is_comp(page)
 				== dict_table_is_comp(index->table));
 			ptr = btr_parse_page_reorganize(ptr, end_ptr, index,
-								page, mtr);
+							page, page_zip, mtr);
 		}
 		break;
 	case MLOG_PAGE_CREATE: case MLOG_COMP_PAGE_CREATE: