Merge lp://qastaging/~sergei.glushchenko/percona-xtrabackup/2.2-xb-bug569387 into lp://qastaging/percona-xtrabackup/2.2
Proposed by
Sergei Glushchenko
Status: | Merged |
---|---|
Approved by: | Alexey Kopytov |
Approved revision: | no longer in the source branch. |
Merged at revision: | 4995 |
Proposed branch: | lp://qastaging/~sergei.glushchenko/percona-xtrabackup/2.2-xb-bug569387 |
Merge into: | lp://qastaging/percona-xtrabackup/2.2 |
Diff against target: |
1051 lines (+674/-143) 9 files modified
storage/innobase/xtrabackup/doc/source/innobackupex/partial_backups_innobackupex.rst (+1/-5) storage/innobase/xtrabackup/doc/source/xtrabackup_bin/partial_backups.rst (+6/-1) storage/innobase/xtrabackup/doc/source/xtrabackup_bin/xbk_option_reference.rst (+8/-0) storage/innobase/xtrabackup/innobackupex.pl (+8/-0) storage/innobase/xtrabackup/src/xtrabackup.cc (+329/-135) storage/innobase/xtrabackup/test/inc/common.sh (+2/-2) storage/innobase/xtrabackup/test/t/ib_databases.sh (+46/-0) storage/innobase/xtrabackup/test/t/ib_databases_file.sh (+56/-0) storage/innobase/xtrabackup/test/t/xb_databases_options.sh (+218/-0) |
To merge this branch: | bzr merge lp://qastaging/~sergei.glushchenko/percona-xtrabackup/2.2-xb-bug569387 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Alexey Kopytov (community) | Approve | ||
Review via email:
|
Description of the change
Manual merge from 2.1
http://
To post a comment you must log in.
What will happened with inline comments after repush?