diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-08 09:39:54 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-08 09:39:54 +0200 |
| commit | a26e7a37266d8296094dabca52f0f6646fd73926 (patch) | |
| tree | e5f974ad280d6815979f9a1104b0638ffd8458f1 /extra | |
| parent | 39e2c95771432cf83e98203a220f7eb602f7068b (diff) | |
| parent | ecc1cd219d427e62acbd37c4c02e1f99d6c2d769 (diff) | |
| download | mariadb-git-a26e7a37266d8296094dabca52f0f6646fd73926.tar.gz | |
Merge 10.3 into 10.4
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 688be07388f..49a774ba576 100644 --- a/extra/mariabackup/xtrabackup.cc +++ b/extra/mariabackup/xtrabackup.cc @@ -4672,13 +4672,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); } |