Merge 10.3 into 10.4

4 files changed, 16 insertions, 16 deletions

diff --git a/extra/mariabackup/backup_copy.cc b/extra/mariabackup/backup_copy.cc
index 293b8d02af2..abd9f710983 100644
--- a/extra/mariabackup/backup_copy.cc
+++ b/extra/mariabackup/backup_copy.cc
@@ -558,9 +558,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 53fd4995b7c..56a6748ac5e 100644
--- a/extra/mariabackup/changed_page_bitmap.cc
+++ b/extra/mariabackup/changed_page_bitmap.cc
@@ -196,7 +196,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 8dcb07d069d..6b186319539 100644
--- a/extra/mariabackup/fil_cur.cc
+++ b/extra/mariabackup/fil_cur.cc
@@ -252,7 +252,7 @@ xb_fil_cur_open(
 	if (!node->space->crypt_data
 	    && os_file_read(IORequestRead,
 			    node->handle, cursor->buf, 0,
-			    cursor->page_size)) {
+			    cursor->page_size) == DB_SUCCESS) {
 		mutex_enter(&fil_system.mutex);
 		if (!node->space->crypt_data) {
 			node->space->crypt_data = fil_space_read_crypt_data(
@@ -445,8 +445,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 cc00436ebe9..274248163d5 100644
--- a/extra/mariabackup/xtrabackup.cc
+++ b/extra/mariabackup/xtrabackup.cc
@@ -3301,8 +3301,8 @@ static dberr_t xb_assign_undo_space_start()
 	buf = static_cast<byte*>(ut_malloc_nokey(2U << srv_page_size_shift));
 	page = static_cast<byte*>(ut_align(buf, srv_page_size));
 
-	if (!os_file_read(IORequestRead, file, page,
-			  0, srv_page_size)) {
+	if (os_file_read(IORequestRead, file, page, 0, srv_page_size)
+	    != DB_SUCCESS) {
 		msg("Reading first page failed.\n");
 		error = DB_ERROR;
 		goto func_exit;
@@ -3311,10 +3311,10 @@ static dberr_t xb_assign_undo_space_start()
 	fsp_flags = mach_read_from_4(
 			page + FSP_HEADER_OFFSET + FSP_SPACE_FLAGS);
 retry:
-	if (!os_file_read(IORequestRead, file, page,
-			  TRX_SYS_PAGE_NO << srv_page_size_shift,
-			  srv_page_size)) {
-		msg("Reading TRX_SYS page failed.\n");
+	if (os_file_read(IORequestRead, file, page,
+			 TRX_SYS_PAGE_NO << srv_page_size_shift,
+			 srv_page_size) != DB_SUCCESS) {
+		msg("Reading TRX_SYS page failed.");
 		error = DB_ERROR;
 		goto func_exit;
 	}
@@ -4619,7 +4619,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);
@@ -4916,7 +4916,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;
 		}
 
@@ -4949,7 +4949,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;
 		}
 
@@ -4997,7 +4997,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;
 			}
 		}