branches/zip: Replace all references to block->space and block->offset,

which should have been replaced in r1057.

btr/btr0btr.c

@@ -2566,7 +2566,7 @@ btr_discard_page(
 	block = btr_cur_get_block(cursor);
 	index = btr_cur_get_index(cursor);
 
-	ut_ad(dict_index_get_page(index) != block->offset);
+	ut_ad(dict_index_get_page(index) != buf_block_get_page_no(block));
 	ut_ad(mtr_memo_contains(mtr, dict_index_get_lock(index),
 				MTR_MEMO_X_LOCK));
 	ut_ad(mtr_memo_contains(mtr, block, MTR_MEMO_PAGE_X_FIX));
@@ -2802,7 +2802,7 @@ btr_check_node_ptr(
 	page_t*		page = buf_block_get_frame(block);
 
 	ut_ad(mtr_memo_contains(mtr, block, MTR_MEMO_PAGE_X_FIX));
-	if (dict_index_get_page(index) == block->offset) {
+	if (dict_index_get_page(index) == buf_block_get_page_no(block)) {
 
 		return(TRUE);
 	}

buf/buf0buf.c

@@ -1543,7 +1543,8 @@ buf_page_get_gen(
 	}
 
 #ifdef UNIV_IBUF_DEBUG
-	ut_a(ibuf_count_get(block->space, block->offset) == 0);
+	ut_a(ibuf_count_get(buf_block_get_space(block),
+			    buf_block_get_page_no(block)) == 0);
 #endif
 	return(block);
 }
@@ -1595,8 +1596,9 @@ buf_page_optimistic_get_func(
 	/* Check if this is the first access to the page */
 
 	ut_ad(!ibuf_inside()
-	      || ibuf_page(block->space, buf_block_get_zip_size(block),
-			   block->offset));
+	      || ibuf_page(buf_block_get_space(block),
+			   buf_block_get_zip_size(block),
+			   buf_block_get_page_no(block)));
 
 	if (rw_latch == RW_S_LATCH) {
 		success = rw_lock_s_lock_func_nowait(&(block->lock),
@@ -1664,7 +1666,8 @@ buf_page_optimistic_get_func(
 	}
 
 #ifdef UNIV_IBUF_DEBUG
-	ut_a(ibuf_count_get(block->space, block->offset) == 0);
+	ut_a(ibuf_count_get(buf_block_get_space(block),
+			    buf_block_get_page_no(block)) == 0);
 #endif
 	buf_pool->n_page_gets++;
 
@@ -1760,7 +1763,8 @@ buf_page_get_known_nowait(
 
 #ifdef UNIV_IBUF_DEBUG
 	ut_a((mode == BUF_KEEP_OLD)
-	     || (ibuf_count_get(block->space, block->offset) == 0));
+	     || (ibuf_count_get(buf_block_get_space(block),
+				buf_block_get_page_no(block)) == 0));
 #endif
 	buf_pool->n_page_gets++;
 
@@ -2022,7 +2026,8 @@ buf_page_create(
 
 	if (block != NULL) {
 #ifdef UNIV_IBUF_DEBUG
-		ut_a(ibuf_count_get(block->space, block->offset) == 0);
+		ut_a(ibuf_count_get(buf_block_get_space(block),
+				    buf_block_get_page_no(block)) == 0);
 #endif
 #ifdef UNIV_DEBUG_FILE_ACCESSES
 		block->file_page_was_freed = FALSE;
@@ -2095,7 +2100,8 @@ buf_page_create(
 	ut_a(++buf_dbg_counter % 357 || buf_validate());
 #endif /* UNIV_DEBUG || UNIV_BUF_DEBUG */
 #ifdef UNIV_IBUF_DEBUG
-	ut_a(ibuf_count_get(block->space, block->offset) == 0);
+	ut_a(ibuf_count_get(buf_block_get_space(block),
+			    buf_block_get_page_no(block)) == 0);
 #endif
 	return(block);
 }
@@ -2188,9 +2194,9 @@ buf_page_io_complete(
 			    && block->page.space != read_space_id)
 			   || block->page.offset != read_page_no) {
 			/* We did not compare space_id to read_space_id
-			if block->space == 0, because the field on the
+			if block->page.space == 0, because the field on the
 			page may contain garbage in MySQL < 4.1.1,
-			which only supported block->space == 0. */
+			which only supported block->page.space == 0. */
 
 			ut_print_timestamp(stderr);
 			fprintf(stderr,
@@ -2267,7 +2273,8 @@ buf_page_io_complete(
 	mutex_enter(&block->mutex);
 
 #ifdef UNIV_IBUF_DEBUG
-	ut_a(ibuf_count_get(block->space, block->offset) == 0);
+	ut_a(ibuf_count_get(buf_block_get_space(block),
+			    buf_block_get_page_no(block)) == 0);
 #endif
 	/* Because this thread which does the unlocking is not the same that
 	did the locking, we use a pass value != 0 in unlock, which simply
@@ -2317,7 +2324,8 @@ buf_page_io_complete(
 #ifdef UNIV_DEBUG
 	if (buf_debug_prints) {
 		fprintf(stderr, "page space %lu page no %lu\n",
-			(ulong) block->space, (ulong) block->offset);
+			(ulong) buf_block_get_space(block),
+			(ulong) buf_block_get_page_no(block));
 	}
 #endif /* UNIV_DEBUG */
 }
@@ -2382,17 +2390,25 @@ buf_validate(void)
 			mutex_enter(&block->mutex);
 
 			switch (buf_block_get_state(block)) {
+			case BUF_BLOCK_ZIP_PAGE:
+				/* TODO: validate page_zip */
+				ut_error;
+				break;
 			case BUF_BLOCK_FILE_PAGE:
 
-				ut_a(buf_page_hash_get(block->space,
-						       block->offset)
+				ut_a(buf_page_hash_get(buf_block_get_space(
+							       block),
+						       buf_block_get_page_no(
+							       block))
 				     == block);
 				n_page++;
 
 #ifdef UNIV_IBUF_DEBUG
 				ut_a((block->io_fix == BUF_IO_READ)
-				     || !ibuf_count_get(block->space,
-							block->offset));
+				     || !ibuf_count_get(buf_block_get_space(
+								block),
+							buf_block_get_page_no(
+								block)));
 #endif
 				if (block->io_fix == BUF_IO_WRITE) {
 

buf/buf0flu.c

@@ -586,7 +586,8 @@ buf_flush_write_block_low(
 	ut_a(buf_block_get_state(block) == BUF_BLOCK_FILE_PAGE);
 
 #ifdef UNIV_IBUF_DEBUG
-	ut_a(ibuf_count_get(block->space, block->offset) == 0);
+	ut_a(ibuf_count_get(buf_block_get_space(block),
+			    buf_block_get_page_no(block)) == 0);
 #endif
 	ut_ad(!ut_dulint_is_zero(block->newest_modification));
 
@@ -689,7 +690,8 @@ buf_flush_try_page(
 		if (buf_debug_prints) {
 			fprintf(stderr,
 				"Flushing page space %lu, page no %lu \n",
-				(ulong) block->space, (ulong) block->offset);
+				(ulong) buf_block_get_space(block),
+				(ulong) buf_block_get_page_no(block));
 		}
 #endif /* UNIV_DEBUG */
 
@@ -756,8 +758,8 @@ buf_flush_try_page(
 			fprintf(stderr,
 				"Flushing single page space %lu,"
 				" page no %lu \n",
-				(ulong) block->space,
-				(ulong) block->offset);
+				(ulong) buf_block_get_space(block),
+				(ulong) buf_block_get_page_no(block));
 		}
 #endif /* UNIV_DEBUG */
 

buf/buf0lru.c

@@ -110,8 +110,8 @@ buf_LRU_invalidate_tablespace(
 			if (buf_debug_prints) {
 				fprintf(stderr,
 					"Dropping space %lu page %lu\n",
-					(ulong) block->space,
-					(ulong) block->offset);
+					(ulong) buf_block_get_space(block),
+					(ulong) buf_block_get_page_no(block));
 			}
 #endif
 			if (block->is_hashed) {
@@ -217,7 +217,8 @@ buf_LRU_free_block(
 #ifdef UNIV_DEBUG
 	if (buf_debug_prints) {
 		fprintf(stderr, "Putting space %lu page %lu to free list\n",
-			(ulong) block->space, (ulong) block->offset);
+			(ulong) buf_block_get_space(block),
+			(ulong) buf_block_get_page_no(block));
 	}
 #endif /* UNIV_DEBUG */
 
@@ -1073,7 +1074,9 @@ buf_LRU_print(void)
 
 	while (block != NULL) {
 
-		fprintf(stderr, "BLOCK %lu ", (ulong) block->offset);
+		fprintf(stderr, "BLOCK space %lu page %lu ",
+			(ulong) buf_block_get_space(block),
+			(ulong) buf_block_get_page_no(block));
 
 		if (block->old) {
 			fputs("old ", stderr);

ibuf/ibuf0ibuf.c

@@ -3140,8 +3140,8 @@ ibuf_merge_or_delete_for_page(
 	ibool		corruption_noticed	= FALSE;
 	mtr_t		mtr;
 
-	ut_ad(!block || block->space == space);
-	ut_ad(!block || block->offset == page_no);
+	ut_ad(!block || buf_block_get_space(block) == space);
+	ut_ad(!block || buf_block_get_page_no(block) == page_no);
 	ut_ad(!block || buf_block_get_zip_size(block) == zip_size);
 
 	if (srv_force_recovery >= SRV_FORCE_NO_IBUF_MERGE) {