Commit 92f2a680 authored by marko's avatar marko

branches/zip: btr_store_big_rec_extern_fields(): Replace

page_get_page_no(page_align(field_ref)) calls with a local variable
rec_page_no = buf_block_get_page_no(rec_block).
parent 954237c0
...@@ -3590,6 +3590,7 @@ btr_store_big_rec_extern_fields( ...@@ -3590,6 +3590,7 @@ btr_store_big_rec_extern_fields(
containing the latch to rec and to the containing the latch to rec and to the
tree */ tree */
{ {
ulint rec_page_no;
byte* field_ref; byte* field_ref;
ulint extern_len; ulint extern_len;
ulint store_len; ulint store_len;
...@@ -3614,6 +3615,7 @@ btr_store_big_rec_extern_fields( ...@@ -3614,6 +3615,7 @@ btr_store_big_rec_extern_fields(
== buf_block_get_zip_size(rec_block)); == buf_block_get_zip_size(rec_block));
space_id = buf_block_get_space(rec_block); space_id = buf_block_get_space(rec_block);
rec_page_no = buf_block_get_page_no(rec_block);
if (UNIV_LIKELY_NULL(page_zip)) { if (UNIV_LIKELY_NULL(page_zip)) {
int err; int err;
...@@ -3662,8 +3664,7 @@ btr_store_big_rec_extern_fields( ...@@ -3662,8 +3664,7 @@ btr_store_big_rec_extern_fields(
mtr_start(&mtr); mtr_start(&mtr);
if (prev_page_no == FIL_NULL) { if (prev_page_no == FIL_NULL) {
hint_page_no = 1 hint_page_no = 1 + rec_page_no;
+ page_get_page_no(page_align(rec));
} else { } else {
hint_page_no = prev_page_no + 1; hint_page_no = prev_page_no + 1;
} }
...@@ -3759,11 +3760,8 @@ btr_store_big_rec_extern_fields( ...@@ -3759,11 +3760,8 @@ btr_store_big_rec_extern_fields(
goto next_zip_page; goto next_zip_page;
} }
rec_block = buf_page_get( rec_block = buf_page_get(space_id, rec_page_no,
space_id, RW_X_LATCH, &mtr);
page_get_page_no(
page_align(field_ref)),
RW_X_LATCH, &mtr);
#ifdef UNIV_SYNC_DEBUG #ifdef UNIV_SYNC_DEBUG
buf_block_dbg_add_level(rec_block, buf_block_dbg_add_level(rec_block,
SYNC_NO_ORDER_CHECK); SYNC_NO_ORDER_CHECK);
...@@ -3837,11 +3835,8 @@ next_zip_page: ...@@ -3837,11 +3835,8 @@ next_zip_page:
extern_len -= store_len; extern_len -= store_len;
rec_block = buf_page_get( rec_block = buf_page_get(space_id, rec_page_no,
space_id, RW_X_LATCH, &mtr);
page_get_page_no(
page_align(field_ref)),
RW_X_LATCH, &mtr);
#ifdef UNIV_SYNC_DEBUG #ifdef UNIV_SYNC_DEBUG
buf_block_dbg_add_level(rec_block, buf_block_dbg_add_level(rec_block,
SYNC_NO_ORDER_CHECK); SYNC_NO_ORDER_CHECK);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment