diff options
Diffstat (limited to 'extra/mariabackup')
| -rw-r--r-- | extra/mariabackup/backup_copy.cc | 4 | ||||
| -rw-r--r-- | extra/mariabackup/changed_page_bitmap.cc | 2 | ||||
| -rw-r--r-- | extra/mariabackup/fil_cur.cc | 6 | ||||
| -rw-r--r-- | extra/mariabackup/xtrabackup.cc | 12 |
4 files changed, 12 insertions, 12 deletions
diff --git a/extra/mariabackup/backup_copy.cc b/extra/mariabackup/backup_copy.cc index 30ec5539c2d..fa665a798ac 100644 --- a/extra/mariabackup/backup_copy.cc +++ b/extra/mariabackup/backup_copy.cc @@ -559,9 +559,9 @@ datafile_read(datafile_cur_t *cursor) return(XB_FIL_CUR_EOF); } - if (!os_file_read(IORequestRead, + if (os_file_read(IORequestRead, cursor->file, cursor->buf, cursor->buf_offset, - to_read)) { + to_read) != DB_SUCCESS) { return(XB_FIL_CUR_ERROR); } diff --git a/extra/mariabackup/changed_page_bitmap.cc b/extra/mariabackup/changed_page_bitmap.cc index f6e9812b0c5..a21c498527a 100644 --- a/extra/mariabackup/changed_page_bitmap.cc +++ b/extra/mariabackup/changed_page_bitmap.cc @@ -195,7 +195,7 @@ log_online_read_bitmap_page( ut_a(bitmap_file->offset % MODIFIED_PAGE_BLOCK_SIZE == 0); success = os_file_read(IORequestRead, bitmap_file->file, page, bitmap_file->offset, - MODIFIED_PAGE_BLOCK_SIZE); + MODIFIED_PAGE_BLOCK_SIZE) == DB_SUCCESS; if (UNIV_UNLIKELY(!success)) { diff --git a/extra/mariabackup/fil_cur.cc b/extra/mariabackup/fil_cur.cc index fd5e1bc02dd..b5e7ba6a83e 100644 --- a/extra/mariabackup/fil_cur.cc +++ b/extra/mariabackup/fil_cur.cc @@ -253,7 +253,7 @@ xb_fil_cur_open( if (!node->space->crypt_data && os_file_read(IORequestRead, node->handle, cursor->buf, 0, - page_size.physical())) { + page_size.physical()) == DB_SUCCESS) { mutex_enter(&fil_system->mutex); if (!node->space->crypt_data) { node->space->crypt_data @@ -442,8 +442,8 @@ read_retry: cursor->buf_offset = offset; cursor->buf_page_no = (ulint)(offset / page_size); - if (!os_file_read(IORequestRead, cursor->file, cursor->buf, offset, - (ulint) to_read)) { + if (os_file_read(IORequestRead, cursor->file, cursor->buf, offset, + (ulint) to_read) != DB_SUCCESS) { ret = XB_FIL_CUR_ERROR; goto func_exit; } diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc index 4b6ba960c05..07d21029733 100644 --- a/extra/mariabackup/xtrabackup.cc +++ b/extra/mariabackup/xtrabackup.cc @@ -3302,8 +3302,8 @@ static dberr_t xb_assign_undo_space_start() page = static_cast<byte*>(ut_align(buf, UNIV_PAGE_SIZE)); retry: - if (!os_file_read(IORequestRead, file, page, TRX_SYS_PAGE_NO * UNIV_PAGE_SIZE, - UNIV_PAGE_SIZE)) { + if (os_file_read(IORequestRead, file, page, TRX_SYS_PAGE_NO * UNIV_PAGE_SIZE, + UNIV_PAGE_SIZE) != DB_SUCCESS) { msg("Reading TRX_SYS page failed."); error = DB_ERROR; goto func_exit; @@ -4655,7 +4655,7 @@ xb_space_create_file( free(buf); - if (!ret) { + if (ret != DB_SUCCESS) { msg("mariabackup: could not write the first page to %s", path); os_file_close(*file); @@ -4947,7 +4947,7 @@ xtrabackup_apply_delta( << page_size_shift); success = os_file_read(IORequestRead, src_file, incremental_buffer, offset, page_size); - if (!success) { + if (success != DB_SUCCESS) { goto error; } @@ -4980,7 +4980,7 @@ xtrabackup_apply_delta( success = os_file_read(IORequestRead, src_file, incremental_buffer, offset, page_in_buffer * page_size); - if (!success) { + if (success != DB_SUCCESS) { goto error; } @@ -5029,7 +5029,7 @@ xtrabackup_apply_delta( success = os_file_write(IORequestWrite, dst_path, dst_file, buf, off, page_size); - if (!success) { + if (success != DB_SUCCESS) { goto error; } } |