diff options
Diffstat (limited to 'storage/innobase/row/row0import.cc')
| -rw-r--r-- | storage/innobase/row/row0import.cc | 28 |
1 files changed, 4 insertions, 24 deletions
diff --git a/storage/innobase/row/row0import.cc b/storage/innobase/row/row0import.cc index 148d223a364..9d48d90c962 100644 --- a/storage/innobase/row/row0import.cc +++ b/storage/innobase/row/row0import.cc @@ -2022,29 +2022,13 @@ dberr_t PageConverter::operator()(buf_block_t* block) UNIV_NOTHROW ulint page_type; - dberr_t err = update_page(block, page_type); - if (err != DB_SUCCESS) return err; + if (dberr_t err = update_page(block, page_type)) { + return err; + } const bool full_crc32 = fil_space_t::full_crc32(get_space_flags()); - const bool page_compressed = fil_space_t::is_compressed(get_space_flags()); if (!block->page.zip.data) { - if (full_crc32 - && (block->page.encrypted || page_compressed) - && block->page.id.page_no() > 0) { - byte* page = block->frame; - mach_write_to_8(page + FIL_PAGE_LSN, m_current_lsn); - - if (!page_compressed) { - mach_write_to_4( - page + (srv_page_size - - FIL_PAGE_FCRC32_END_LSN), - (ulint) m_current_lsn); - } - - return err; - } - buf_flush_init_for_writing( NULL, block->frame, NULL, m_current_lsn, full_crc32); } else if (fil_page_type_is_index(page_type)) { @@ -2140,7 +2124,7 @@ row_import_cleanup( DBUG_EXECUTE_IF("ib_import_before_checkpoint_crash", DBUG_SUICIDE();); - log_make_checkpoint_at(LSN_MAX); + log_make_checkpoint(); return(err); } @@ -3484,10 +3468,6 @@ not_encrypted: goto page_corrupted; } - if (encrypted) { - block->page.encrypted = true; - } - if ((err = callback(block)) != DB_SUCCESS) { goto func_exit; } else if (!updated) { |