Percona XtraBackup moved to https://jira.percona.com/projects/PXB

Merge lp://staging/~lachlan-mulcahy/percona-xtrabackup/1.6-bug903984 into lp://staging/percona-xtrabackup/1.6

1.6-bug903984
Merge into release-1.6

Proposed by Lachlan Mulcahy on 2011-12-16

Status:

Merged

Approved by:

Alexey Kopytov on 2011-12-17

Approved revision:

no longer in the source branch.

Merged at revision:

312

Proposed branch:

lp://staging/~lachlan-mulcahy/percona-xtrabackup/1.6-bug903984

Merge into:

lp://staging/percona-xtrabackup/1.6

Diff against target:

50 lines (+34/-8)

1 file modified

innobackupex (+34/-8)

To merge this branch:

bzr merge lp://staging/~lachlan-mulcahy/percona-xtrabackup/1.6-bug903984

Undecided

Fix Released

Link a bug report

Reviewer	Date Requested	Status
Alexey Kopytov (community)		Approve on 2011-12-17
Stewart Smith	2011-12-16	Pending
Review via email: mp+86127@code.staging.launchpad.net

Commit message

Fixed bug 903984.
When applying incremental deltas to a backup dir:

If a new xtrabackup_slave_info exists in the incremental delta dir, we update the target dir with the new file
If there is no xtrabackup_slave_info file in the incremental delta dir, we simply remove the xtrabackup_slave_info file from the target dir, to prevent the slave position information being used incorrectly.