diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-08 10:16:20 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-08 10:16:20 +0200 |
| commit | a5d3c1c819b0c4ba93943f11f592d4379afcdc81 (patch) | |
| tree | a8e7aa820874fea794f9f9cdb7a09f37021923a5 /extra | |
| parent | f6cb9e6e2dd0fb2e29a09030e74de7946139e1f4 (diff) | |
| parent | a26e7a37266d8296094dabca52f0f6646fd73926 (diff) | |
| download | mariadb-git-a5d3c1c819b0c4ba93943f11f592d4379afcdc81.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/mariabackup/xtrabackup.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc index 495c7d7e2fe..5523392bbdb 100644 --- a/extra/mariabackup/xtrabackup.cc +++ b/extra/mariabackup/xtrabackup.cc @@ -4537,13 +4537,12 @@ fail_before_log_copying_thread_start: log_file_op = NULL; pthread_mutex_destroy(&backup_mutex); pthread_cond_destroy(&scanned_lsn_cond); - if (opt_log_innodb_page_corruption && !corrupted_pages.empty()) { + if (!corrupted_pages.empty()) { + ut_ad(opt_log_innodb_page_corruption); msg("Error: corrupted innodb pages are found and logged to " MB_CORRUPTED_PAGES_FILE " file"); - return false; } - else - return(true); + return(true); } |