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

Proposed by Alexey Kopytov
Status: Merged
Merged at revision: 656
Proposed branch: lp:~akopytov/percona-xtrabackup/bug1206309-addendum-2.1
Merge into: lp:percona-xtrabackup/2.1
Diff against target: 27 lines (+4/-4)
1 file modified
src/xtrabackup.cc (+4/-4)
To merge this branch: bzr merge lp:~akopytov/percona-xtrabackup/bug1206309-addendum-2.1
Reviewer Review Type Date Requested Status
Percona core Pending
Review via email: mp+179649@code.launchpad.net
To post a comment you must log in.

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-08-07 06:45:47 +0000
3+++ src/xtrabackup.cc 2013-08-12 09:37:31 +0000
4@@ -2087,9 +2087,12 @@
5 if (no != scanned_no && checksum_is_ok) {
6 ulint blocks_in_group;
7
8+ blocks_in_group = log_block_convert_lsn_to_no(
9+ log_group_get_capacity(group)) - 1;
10+
11 if (no < scanned_no ||
12 /* Log block numbers wrap around at 0x3FFFFFFF */
13- (scanned_no | 0x4000000UL - no) %
14+ ((scanned_no | 0x4000000UL) - no) %
15 blocks_in_group == 0) {
16
17 /* old log block, do nothing */
18@@ -2098,9 +2101,6 @@
19 break;
20 }
21
22- blocks_in_group = log_block_convert_lsn_to_no(
23- log_group_get_capacity(group)) - 1;
24-
25 msg("xtrabackup: error:"
26 " log block numbers mismatch:\n"
27 "xtrabackup: error: expected log block no. %lu,"

Subscribers

People subscribed via source and target branches

to all changes: