Commit 12ccbd8a authored by marko's avatar marko

branches/zip: Remove a bogus page_zip_validate() assertion failure found

by running index_merge_ror_cpk on 1-kilobyte compressed pages.

page_delete_rec_list_start(): Remove the page_zip_validate() assertion.

btr_page_split_and_insert(): Add page_zip_validate() assertions about
page and new_page after moving the records.
parent 143aa19a
...@@ -1858,6 +1858,13 @@ btr_page_split_and_insert( ...@@ -1858,6 +1858,13 @@ btr_page_split_and_insert(
lock_update_split_right(right_page, left_page); lock_update_split_right(right_page, left_page);
} }
#ifdef UNIV_ZIP_DEBUG
if (UNIV_LIKELY_NULL(page_zip)) {
ut_a(page_zip_validate(page_zip, page));
ut_a(page_zip_validate(new_page_zip, new_page));
}
#endif /* UNIV_ZIP_DEBUG */
/* At this point, split_rec, move_limit and first_rec may point /* At this point, split_rec, move_limit and first_rec may point
to garbage on the old page. */ to garbage on the old page. */
......
...@@ -1040,10 +1040,10 @@ page_delete_rec_list_start( ...@@ -1040,10 +1040,10 @@ page_delete_rec_list_start(
ut_ad((ibool) !!page_rec_is_comp(rec) ut_ad((ibool) !!page_rec_is_comp(rec)
== dict_table_is_comp(index->table)); == dict_table_is_comp(index->table));
#ifdef UNIV_ZIP_DEBUG /* page_zip_validate() would detect a min_rec_mark mismatch
ut_a(!page_zip || page_zip_validate(page_zip, in btr_page_split_and_insert()
ut_align_down(rec, UNIV_PAGE_SIZE))); between btr_attach_half_pages() and insert_page = ...
#endif /* UNIV_ZIP_DEBUG */ when btr_page_get_split_rec_to_left() holds (direction == FSP_DOWN). */
if (page_rec_is_infimum(rec)) { if (page_rec_is_infimum(rec)) {
......
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