MDEV-13310 Preparing an incremental backup twice can corrupt data

Remove .delta file after it was successfully applied

MDEV-13310 Preparing an incremental backup twice can corrupt data
Remove .delta file after it was successfully applied
bb3f4fbb · Vladislav Vaintroub · 8d1fb47e · bb3f4fbb
Commit bb3f4fbb authored Oct 07, 2017 by Vladislav Vaintroub
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

extra/mariabackup/xtrabackup.cc extra/mariabackup/xtrabackup.cc +4 -1

No files found.
--- a/extra/mariabackup/xtrabackup.cc
+++ b/extra/mariabackup/xtrabackup.cc
@@ -4974,8 +4974,11 @@ xtrabackup_apply_delta(
 	if (incremental_buffer_base)
 		ut_free(incremental_buffer_base);
-	if (src_file != XB_FILE_UNDEFINED)
+	if (src_file != XB_FILE_UNDEFINED) {
 		os_file_close(src_file);
+		/* Remove .delta file after it was successfully applied.*/
+		os_file_delete(0,src_path);
+	}
 	if (dst_file != XB_FILE_UNDEFINED)
 		os_file_close(dst_file);
 	return TRUE;