Commit 3c2576fd authored by marko's avatar marko

branches/zip: Remove a bogus assertion.

page_zip_write_rec(): Allow the record to be delete-marked.
parent dfebdee9
...@@ -1910,10 +1910,12 @@ page_zip_write_rec( ...@@ -1910,10 +1910,12 @@ page_zip_write_rec(
slot = page_zip_dir_find(page_zip, slot = page_zip_dir_find(page_zip,
ut_align_offset(rec, UNIV_PAGE_SIZE)); ut_align_offset(rec, UNIV_PAGE_SIZE));
ut_a(slot); ut_a(slot);
/* Clear the delete mark bit. */ /* Copy the delete mark. */
ut_ad(!(rec_get_info_bits((rec_t*) rec, TRUE) if (rec_get_deleted_flag((rec_t*) rec, TRUE)) {
& REC_INFO_DELETED_FLAG)); *slot |= PAGE_ZIP_DIR_SLOT_DEL >> 8;
*slot &= ~(PAGE_ZIP_DIR_SLOT_DEL >> 8); } else {
*slot &= ~(PAGE_ZIP_DIR_SLOT_DEL >> 8);
}
ut_ad(rec_get_start((rec_t*) rec, offsets) >= page + PAGE_ZIP_START); ut_ad(rec_get_start((rec_t*) rec, offsets) >= page + PAGE_ZIP_START);
ut_ad(rec_get_end((rec_t*) rec, offsets) <= page + UNIV_PAGE_SIZE ut_ad(rec_get_end((rec_t*) rec, offsets) <= page + UNIV_PAGE_SIZE
...@@ -2432,7 +2434,6 @@ page_zip_rec_set_owned( ...@@ -2432,7 +2434,6 @@ page_zip_rec_set_owned(
} }
} }
/************************************************************************** /**************************************************************************
Shift the dense page directory and the array of BLOB pointers Shift the dense page directory and the array of BLOB pointers
when a record is deleted. */ when a record is deleted. */
......
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