diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-08 08:22:34 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-08 08:22:34 +0300 |
| commit | d8303c3ee7750f4003e3561c3e60ee6e636bf9ad (patch) | |
| tree | e4e8bb9a850836859974be09bf8cf524ea21491c /extra | |
| parent | a2afba8b01c249971f600a82f1a9b0a119374b9a (diff) | |
| parent | cc492bfd4ff2d15cc5803a7d80f1559ceeb003c1 (diff) | |
| download | mariadb-git-d8303c3ee7750f4003e3561c3e60ee6e636bf9ad.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/mariabackup/xtrabackup.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc index 0bf027cf243..b5e78743106 100644 --- a/extra/mariabackup/xtrabackup.cc +++ b/extra/mariabackup/xtrabackup.cc @@ -2752,8 +2752,13 @@ static bool xtrabackup_copy_logfile(bool last = false) my_sleep(1000); } - start_lsn = (lsn == start_lsn) - ? 0 : xtrabackup_copy_log(start_lsn, lsn, last); + if (lsn == start_lsn) { + start_lsn = 0; + } else { + mutex_enter(&recv_sys->mutex); + start_lsn = xtrabackup_copy_log(start_lsn, lsn, last); + mutex_exit(&recv_sys->mutex); + } log_mutex_exit(); |