summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-12-27 13:05:06 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2019-12-27 15:14:48 +0200
commit5ab70e7f68ba9659dbdd8c71759cfe99ee90ebf2 (patch)
treecde569f712505f981e7a43f01e82c600e282c88c /extra
parentee9a19fb054085fcea006a25ec957e0d5cb01ce8 (diff)
parent16bce0f6fe6bcad0091dc45a97a8ac7b33fe9d44 (diff)
downloadmariadb-git-5ab70e7f68ba9659dbdd8c71759cfe99ee90ebf2.tar.gz
Merge 10.2 into 10.3
Diffstat (limited to 'extra')
-rw-r--r--extra/mariabackup/xtrabackup.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc
index 0c2ec0bed18..ddaed8bd16a 100644
--- a/extra/mariabackup/xtrabackup.cc
+++ b/extra/mariabackup/xtrabackup.cc
@@ -2683,7 +2683,9 @@ static lsn_t xtrabackup_copy_log(lsn_t start_lsn, lsn_t end_lsn, bool last)
}
}
- if (more_data && recv_parse_log_recs(0, STORE_NO, false)) {
+ store_t store = STORE_NO;
+
+ if (more_data && recv_parse_log_recs(0, &store, 0, false)) {
msg("Error: copying the log failed");