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

Proposed by Alexey Kopytov
Status: Merged
Merged at revision: 578
Proposed branch: lp:~akopytov/percona-xtrabackup/bug1206309-addendum-2.0
Merge into: lp:percona-xtrabackup/2.0
Diff against target: 39 lines (+10/-10)
1 file modified
src/xtrabackup.cc (+10/-10)
To merge this branch: bzr merge lp:~akopytov/percona-xtrabackup/bug1206309-addendum-2.0
Reviewer Review Type Date Requested Status
Percona core Pending
Review via email: mp+179648@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:43:31 +0000
3+++ src/xtrabackup.cc 2013-08-12 09:37:22 +0000
4@@ -4509,9 +4509,18 @@
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+#ifndef INNODB_VERSION_SHORT
10+ ut_dulint_create(0,
11+ log_group_get_capacity(group))
12+#else
13+ log_group_get_capacity(group)
14+#endif
15+ ) - 1;
16+
17 if (no < scanned_no ||
18 /* Log block numbers wrap around at 0x3FFFFFFF */
19- (scanned_no | 0x4000000UL - no) %
20+ ((scanned_no | 0x4000000UL) - no) %
21 blocks_in_group == 0) {
22
23 /* old log block, do nothing */
24@@ -4520,15 +4529,6 @@
25 break;
26 }
27
28- blocks_in_group = log_block_convert_lsn_to_no(
29-#ifndef INNODB_VERSION_SHORT
30- ut_dulint_create(0,
31- log_group_get_capacity(group))
32-#else
33- log_group_get_capacity(group)
34-#endif
35- ) - 1;
36-
37 msg("xtrabackup: error:"
38 " log block numbers mismatch:\n"
39 "xtrabackup: error: expected log block no. %lu,"

Subscribers

People subscribed via source and target branches