Merge lp:~akopytov/percona-xtrabackup/bug1206309-2.1 into lp:percona-xtrabackup/2.1

Proposed by Alexey Kopytov
Status: Merged
Approved by: Alexey Kopytov
Approved revision: no longer in the source branch.
Merged at revision: 651
Proposed branch: lp:~akopytov/percona-xtrabackup/bug1206309-2.1
Merge into: lp:percona-xtrabackup/2.1
Diff against target: 19 lines (+7/-2)
1 file modified
src/xtrabackup.cc (+7/-2)
To merge this branch: bzr merge lp:~akopytov/percona-xtrabackup/bug1206309-2.1
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) Approve
Review via email: mp+178558@code.launchpad.net
To post a comment you must log in.
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
1=== modified file 'src/xtrabackup.cc'
2--- src/xtrabackup.cc 2013-07-30 07:16:18 +0000
3+++ src/xtrabackup.cc 2013-08-05 13:20:45 +0000
4@@ -2087,9 +2087,14 @@
5 if (no != scanned_no && checksum_is_ok) {
6 ulint blocks_in_group;
7
8- if (no < scanned_no) {
9- /* incompletely written log block, do nothing */
10+ if (no < scanned_no ||
11+ /* Log block numbers wrap around at 0x3FFFFFFF */
12+ (scanned_no | 0x4000000UL - no) %
13+ blocks_in_group == 0) {
14+
15+ /* old log block, do nothing */
16 finished = TRUE;
17+
18 break;
19 }
20

Subscribers

People subscribed via source and target branches

to all changes: