Commit f4029526 authored by Marko Mäkelä's avatar Marko Mäkelä

Minor fixes

page_copy_rec_list_end_to_created_page(): Reposition the cursor when
converting the page.

page_delete_rec_list_start(): Relax a too strict assertion.
parent acb47878
...@@ -2130,10 +2130,10 @@ page_copy_rec_list_end_to_created_page( ...@@ -2130,10 +2130,10 @@ page_copy_rec_list_end_to_created_page(
/* TODO: ensure that we trim CHAR columns that /* TODO: ensure that we trim CHAR columns that
use variable-width character set encoding and that use variable-width character set encoding and that
we store no BLOB prefix in ROW_FORMAT=DYNAMIC */ we store no BLOB prefix in ROW_FORMAT=DYNAMIC */
rec_t* insert_rec = page_cur_tuple_insert( cursor.rec = page_cur_tuple_insert(
&cursor, dtuple, index, &offsets, &cursor, dtuple, index, &offsets,
&row_heap, n_ext, mtr); &row_heap, n_ext, mtr);
if (!insert_rec) { if (!cursor.rec) {
ut_ad(!"page overflow"); ut_ad(!"page overflow");
} }
......
...@@ -1242,8 +1242,8 @@ page_delete_rec_list_start( ...@@ -1242,8 +1242,8 @@ page_delete_rec_list_start(
rec_offs_init(offsets_); rec_offs_init(offsets_);
ut_ad((ibool) !!page_rec_is_comp(rec) ut_ad(!!page_rec_is_comp(rec) == index->table->not_redundant()
== dict_table_is_comp(index->table)); || index->dual_format());
#ifdef UNIV_ZIP_DEBUG #ifdef UNIV_ZIP_DEBUG
{ {
page_zip_des_t* page_zip= buf_block_get_page_zip(block); page_zip_des_t* page_zip= buf_block_get_page_zip(block);
......
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