Merge lp://qastaging/~sergei.glushchenko/percona-xtrabackup/xb1.6-bug996493 into lp://qastaging/percona-xtrabackup/1.6

Proposed by Sergei Glushchenko
Status: Merged
Approved by: Alexey Kopytov
Approved revision: no longer in the source branch.
Merged at revision: 350
Proposed branch: lp://qastaging/~sergei.glushchenko/percona-xtrabackup/xb1.6-bug996493
Merge into: lp://qastaging/percona-xtrabackup/1.6
Diff against target: 158 lines (+48/-21)
5 files modified
doc/source/innobackupex/restoring_a_backup_ibk.rst (+1/-1)
innobackupex (+6/-18)
test/t/bug983685.sh (+1/-1)
test/t/bug996493.sh (+39/-0)
xtrabackup.c (+1/-1)
To merge this branch: bzr merge lp://qastaging/~sergei.glushchenko/percona-xtrabackup/xb1.6-bug996493
Reviewer Review Type Date Requested Status
Stewart Smith (community) Approve
Alexey Kopytov (community) Approve
Review via email: mp+106305@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2012-05-14.

Description of the change

Bug 996493: innobackupex --apply-log doesn't read config from backup-my.cnf
Following have been done:
1. Remove datadir and innodb_data_home_dir from backup-my.cnf
2. When do --apply-log read settings from backup-my.cnf
3. When do --copy-back read settings from /etc/my.cnf

Resolved conflicts from previous MP request

To post a comment you must log in.
Revision history for this message
Sergei Glushchenko (sergei.glushchenko) wrote : Posted in a previous version of this proposal
Revision history for this message
Alexey Kopytov (akopytov) : Posted in a previous version of this proposal
review: Approve
Revision history for this message
Stewart Smith (stewart) wrote : Posted in a previous version of this proposal
review: Needs Fixing
Revision history for this message
Alexey Kopytov (akopytov) :
review: Approve
Revision history for this message
Stewart Smith (stewart) wrote :

doesn't cleanly merge into 2.0, may need a corresponding 2.0 branch

review: Needs Fixing
Revision history for this message
Alexey Kopytov (akopytov) wrote :

This has already been merged into 2.0 (and released in 2.0.1). In 2.0 branch:

$ bzr missing --other lp:~sergei.glushchenko/percona-xtrabackup/xb1.6-bug996493
Other branch has no new revisions.

Revision history for this message
Stewart Smith (stewart) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches