branches/zip: Fix a bug in consistent reads of rows containing BLOB data.

btr_rec_copy_externally_stored_field(): Add parameter zip_size.
Do not call buf_block_align(rec), because rec can also be in
dynamically allocated memory.  buf_block_align() can only be invoked
on addresses inside the buffer pool.

page_zip_clear_rec(): Improve formatting.

btr/btr0cur.c

@@ -4264,13 +4264,14 @@ btr_rec_copy_externally_stored_field(
 				/* out: the field copied to heap */
 	rec_t*		rec,	/* in: record */
 	const ulint*	offsets,/* in: array returned by rec_get_offsets() */
+	ulint		zip_size,/* in: nonzero=compressed BLOB page size,
+				zero for uncompressed BLOBs */
 	ulint		no,	/* in: field number */
 	ulint*		len,	/* out: length of the field */
 	mem_heap_t*	heap)	/* in: mem heap */
 {
 	ulint		local_len;
 	byte*		data;
-	page_zip_des_t*	page_zip;
 
 	ut_ad(rec_offs_validate(rec, NULL, offsets));
 	ut_a(rec_offs_nth_extern(offsets, no));
@@ -4286,9 +4287,6 @@ btr_rec_copy_externally_stored_field(
 
 	data = rec_get_nth_field(rec, offsets, no, &local_len);
 
-	page_zip = buf_block_get_page_zip(buf_block_align(rec));
-
 	return(btr_copy_externally_stored_field(len, data,
-				page_zip ? page_zip->size : 0,
-				local_len, heap));
+				zip_size, local_len, heap));
 }

include/btr0cur.h

@@ -508,6 +508,8 @@ btr_rec_copy_externally_stored_field(
 				/* out: the field copied to heap */
 	rec_t*		rec,	/* in: record */
 	const ulint*	offsets,/* in: array returned by rec_get_offsets() */
+	ulint		zip_size,/* in: nonzero=compressed BLOB page size,
+				zero for uncompressed BLOBs */
 	ulint		no,	/* in: field number */
 	ulint*		len,	/* out: length of the field */
 	mem_heap_t*	heap);	/* in: mem heap */

page/page0zip.c

@@ -2700,8 +2700,7 @@ page_zip_clear_rec(
 
 			memset(storage - (heap_no - 1) * REC_NODE_PTR_SIZE,
 				0, REC_NODE_PTR_SIZE);
-		}
-		else if (dict_index_is_clust(index)) {
+		} else if (dict_index_is_clust(index)) {
 			/* Clear trx_id and roll_ptr on the compressed page. */
 			byte*	storage	= page_zip->data + page_zip->size
 					- (page_dir_get_n_heap(page) - 2)

row/row0row.c

@@ -210,7 +210,9 @@ row_build(
 				&& rec_offs_nth_extern(offsets, i)) {
 
 				field = btr_rec_copy_externally_stored_field(
-						rec, offsets, i, &len, heap);
+						rec, offsets,
+						dict_table_zip_size(table),
+						i, &len, heap);
 			}
 
 			dfield_set_data(dfield, field, len);

row/row0sel.c

@@ -321,7 +321,9 @@ row_sel_fetch_columns(
 				heap = mem_heap_create(1);
 
 				data = btr_rec_copy_externally_stored_field(
-					rec, offsets, field_no, &len, heap);
+					rec, offsets,
+					dict_table_zip_size(index->table),
+					field_no, &len, heap);
 
 				ut_a(len != UNIV_SQL_NULL);
 
@@ -2613,8 +2615,10 @@ row_sel_store_mysql_rec(
 			already run out of memory in the next call, which
 			causes an assert */
 
-			data = btr_rec_copy_externally_stored_field(rec,
-					offsets, templ->rec_field_no, &len,
+			data = btr_rec_copy_externally_stored_field(
+					rec, offsets,
+					dict_table_zip_size(prebuilt->table),
+					templ->rec_field_no, &len,
 					heap);
 
 			ut_a(len != UNIV_SQL_NULL);