diff options
Diffstat (limited to 'storage/innobase/row/row0import.cc')
| -rw-r--r-- | storage/innobase/row/row0import.cc | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/storage/innobase/row/row0import.cc b/storage/innobase/row/row0import.cc index 2ec0a06709e..539c2e83f04 100644 --- a/storage/innobase/row/row0import.cc +++ b/storage/innobase/row/row0import.cc @@ -3423,11 +3423,10 @@ fil_iterate( ? iter.crypt_io_buffer : io_buffer; byte* const writeptr = readptr; - IORequest read_request(IORequest::READ); - read_request.disable_partial_io_warnings(); - err = os_file_read_no_error_handling( - read_request, iter.file, readptr, offset, n_bytes, 0); + IORequest(IORequest::READ + | IORequest::DISABLE_PARTIAL_IO_WARNINGS), + iter.file, readptr, offset, n_bytes, 0); if (err != DB_SUCCESS) { ib::error() << iter.filepath << ": os_file_read() failed"; @@ -3760,11 +3759,10 @@ fil_tablespace_iterate( /* Read the first page and determine the page and zip size. */ - IORequest request(IORequest::READ); - request.disable_partial_io_warnings(); - - err = os_file_read_no_error_handling(request, file, page, 0, - srv_page_size, 0); + err = os_file_read_no_error_handling( + IORequest(IORequest::READ + | IORequest::DISABLE_PARTIAL_IO_WARNINGS), + file, page, 0, srv_page_size, 0); if (err == DB_SUCCESS) { err = callback.init(file_size, block); @@ -4175,7 +4173,7 @@ row_import_for_mysql( /* Ensure that all pages dirtied during the IMPORT make it to disk. The only dirty pages generated should be from the pessimistic purge of delete marked records that couldn't be purged in Phase I. */ - buf_LRU_flush_or_remove_pages(prebuilt->table->space_id, true); + while (buf_flush_dirty_pages(prebuilt->table->space_id)); ib::info() << "Phase IV - Flush complete"; prebuilt->table->space->set_imported(); |