Merge lp:~akopytov/percona-xtrabackup/bug1273207-2.2 into lp:percona-xtrabackup/2.2
Proposed by
Alexey Kopytov
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Sergei Glushchenko | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 4949 | ||||
Proposed branch: | lp:~akopytov/percona-xtrabackup/bug1273207-2.2 | ||||
Merge into: | lp:percona-xtrabackup/2.2 | ||||
Diff against target: |
180 lines (+54/-29) 6 files modified
storage/innobase/xtrabackup/src/common.h (+24/-0) storage/innobase/xtrabackup/src/xbcrypt.c (+3/-3) storage/innobase/xtrabackup/src/xbcrypt.h (+1/-2) storage/innobase/xtrabackup/src/xbcrypt_read.c (+8/-8) storage/innobase/xtrabackup/src/xbstream_read.c (+6/-16) storage/innobase/xtrabackup/test/t/bug1273207.sh (+12/-0) |
||||
To merge this branch: | bzr merge lp:~akopytov/percona-xtrabackup/bug1273207-2.2 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Sergei Glushchenko (community) | g2 | Approve | |
Review via email: mp+208730@code.launchpad.net |
Description of the change
Automerge from 2.2.
http://
To post a comment you must log in.
See 2.1