Merge lp://qastaging/~laurynas-biveinis/percona-xtrabackup/bug1098498-1132763-2.1 into lp://qastaging/percona-xtrabackup/2.1
Proposed by
Laurynas Biveinis
| Status: | Merged |
|---|---|
| Approved by: | Alexey Kopytov |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 511 |
| Proposed branch: | lp://qastaging/~laurynas-biveinis/percona-xtrabackup/bug1098498-1132763-2.1 |
| Merge into: | lp://qastaging/percona-xtrabackup/2.1 |
| Diff against target: |
450 lines (+58/-201) 14 files modified
test/inc/common.sh (+23/-19) test/inc/ib_part.sh (+16/-2) test/t/bug766033.sh (+1/-1) test/t/bug766607.sh (+9/-12) test/t/ib_part_databases.sh (+2/-0) test/t/ib_part_include.sh (+1/-4) test/t/ib_part_include_stream.sh (+1/-1) test/t/ib_part_tf_innodb.sh (+1/-0) test/t/ib_part_tf_innodb_stream.sh (+1/-0) test/t/ib_part_tf_myisam.sh (+1/-0) test/t/xb_export.sh (+1/-1) test/t/xb_incremental.sh (+0/-106) test/t/xb_partial.sh (+0/-53) test/testrun.sh (+1/-2) |
| To merge this branch: | bzr merge lp://qastaging/~laurynas-biveinis/percona-xtrabackup/bug1098498-1132763-2.1 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Alexey Kopytov (community) | Approve | ||
| George Ormond Lorch III | g2 | Pending | |
|
Review via email:
|
|||
This proposal supersedes a proposal from 2013-03-04.
Description of the change
Take 3:
http://
BT 28340.
Take 2:
http://
Simple merge from 2.0.
Take 1:
No BT or ST but prerequisite for BT 28340 merge.
Merge bug 1098498 and bug 1132763 fix from 2.0.
Replace stop_server() with kill_server() in the relevant 2.1-only
testcases.
http://
To post a comment you must log in.
Revision history for this message
| George Ormond Lorch III (gl-az) | # |
review:
Approve
(g2)
Revision history for this message
| Laurynas Biveinis (laurynas-biveinis) wrote | # |
Revision history for this message
| George Ormond Lorch III (gl-az) | # |
review:
Approve
(g2)
Revision history for this message
| Alexey Kopytov (akopytov) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Same comments as in the 2.0 MP.