Commit 404d94b3 authored by marko's avatar marko

branches/zip: btr_store_big_rec_extern_fields(),

btr_free_externally_stored_field(): Add some page type assertions
that were suggested by Sunny.
parent 759af551
...@@ -3687,6 +3687,7 @@ btr_store_big_rec_extern_fields( ...@@ -3687,6 +3687,7 @@ btr_store_big_rec_extern_fields(
space_id = buf_block_get_space(rec_block); space_id = buf_block_get_space(rec_block);
zip_size = buf_block_get_zip_size(rec_block); zip_size = buf_block_get_zip_size(rec_block);
rec_page_no = buf_block_get_page_no(rec_block); rec_page_no = buf_block_get_page_no(rec_block);
ut_a(fil_page_get_type(page_align(rec)) == FIL_PAGE_INDEX);
if (UNIV_LIKELY_NULL(page_zip)) { if (UNIV_LIKELY_NULL(page_zip)) {
int err; int err;
...@@ -4112,6 +4113,7 @@ btr_free_externally_stored_field( ...@@ -4112,6 +4113,7 @@ btr_free_externally_stored_field(
if (ext_zip_size) { if (ext_zip_size) {
/* Note that page_zip will be NULL /* Note that page_zip will be NULL
in row_purge_upd_exist_or_extern(). */ in row_purge_upd_exist_or_extern(). */
ut_a(fil_page_get_type(page) == FIL_PAGE_TYPE_ZBLOB);
next_page_no = mach_read_from_4(page + FIL_PAGE_NEXT); next_page_no = mach_read_from_4(page + FIL_PAGE_NEXT);
btr_page_free_low(index, ext_block, 0, &mtr); btr_page_free_low(index, ext_block, 0, &mtr);
...@@ -4138,6 +4140,7 @@ btr_free_externally_stored_field( ...@@ -4138,6 +4140,7 @@ btr_free_externally_stored_field(
ulint part_len = btr_blob_get_part_len( ulint part_len = btr_blob_get_part_len(
page + FIL_PAGE_DATA); page + FIL_PAGE_DATA);
ut_a(fil_page_get_type(page) == FIL_PAGE_TYPE_BLOB);
ut_a(!page_zip); ut_a(!page_zip);
ut_a(extern_len >= part_len); ut_a(extern_len >= part_len);
......
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