diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-08 10:51:31 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-08 10:51:31 +0200 |
| commit | d3467634794e09c8d64f82a736ccdf055e292d16 (patch) | |
| tree | afca16952cd52693c852b47298f2b4879056a096 /extra/mariabackup/xtrabackup.cc | |
| parent | 03ff588d153f22f00ff00923e82498cbac63505f (diff) | |
| parent | a5d3c1c819b0c4ba93943f11f592d4379afcdc81 (diff) | |
| download | mariadb-git-d3467634794e09c8d64f82a736ccdf055e292d16.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'extra/mariabackup/xtrabackup.cc')
| -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 22db660bd54..56ce2a58eff 100644 --- a/extra/mariabackup/xtrabackup.cc +++ b/extra/mariabackup/xtrabackup.cc @@ -4521,13 +4521,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); } |