diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-02-19 11:14:03 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-02-19 11:14:03 +0200 |
| commit | ca76fc4a3a1c5f393e1e34005975582e73e84365 (patch) | |
| tree | 652c5d32048ddcb154652c749d1dced200f05f8f /extra | |
| parent | d2fc9d09da007d41d83e9e29a9f2911eb7f8feee (diff) | |
| download | mariadb-git-ca76fc4a3a1c5f393e1e34005975582e73e84365.tar.gz | |
MDEV-18611: mariabackup silently ended during xtrabackup_copy_logfile()
log_group_read_log_seg(): Always return false when returning
before reading end_lsn.
xtrabackup_copy_logfile(): On error, indicate whether
a corrupt log record was encountered.
Only xtrabackup_copy_logfile() in Mariabackup cared about the
return value of the function. InnoDB crash recovery was not
affected by this bug.
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/mariabackup/xtrabackup.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc index ecbd118aa3b..acd11135289 100644 --- a/extra/mariabackup/xtrabackup.cc +++ b/extra/mariabackup/xtrabackup.cc @@ -2756,7 +2756,10 @@ static bool xtrabackup_copy_logfile(bool last = false) log_mutex_exit(); if (!start_lsn) { - die("xtrabackup_copy_logfile() failed."); + msg(recv_sys->found_corrupt_log + ? "xtrabackup_copy_logfile() failed: corrupt log." + : "xtrabackup_copy_logfile() failed."); + return true; } } while (start_lsn == end_lsn); |