diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-05 10:06:42 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-05 10:06:42 +0200 |
| commit | bcd160753cb0066cc25f262a668e197c1e22b636 (patch) | |
| tree | ed0b6cb849c9e6e019c45392a31aee416c8dfd3d /extra/mariabackup/xtrabackup.cc | |
| parent | e9b8b76f475dc2ed1dfa4c0362cec1f61aa474ad (diff) | |
| parent | 545cba13eb4e013363a126754c040c335874c386 (diff) | |
| download | mariadb-git-bcd160753cb0066cc25f262a668e197c1e22b636.tar.gz | |
Merge 10.2 into 10.3
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 61166570449..7872438d51c 100644 --- a/extra/mariabackup/xtrabackup.cc +++ b/extra/mariabackup/xtrabackup.cc @@ -4665,13 +4665,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); } |