Merge lp:~akopytov/percona-xtrabackup/bug917823 into lp:percona-xtrabackup/2.0

Proposed by Alexey Kopytov
Status: Merged
Approved by: Stewart Smith
Approved revision: no longer in the source branch.
Merged at revision: 385
Proposed branch: lp:~akopytov/percona-xtrabackup/bug917823
Merge into: lp:percona-xtrabackup/2.0
Diff against target: 27 lines (+12/-4)
1 file modified
xtrabackup.c (+12/-4)
To merge this branch: bzr merge lp:~akopytov/percona-xtrabackup/bug917823
Reviewer Review Type Date Requested Status
Stewart Smith (community) Approve
Review via email: mp+91614@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Alexey Kopytov (akopytov) wrote :
Revision history for this message
Stewart Smith (stewart) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'xtrabackup.c'
2--- xtrabackup.c 2012-02-02 20:35:45 +0000
3+++ xtrabackup.c 2012-02-06 07:36:19 +0000
4@@ -3296,12 +3296,20 @@
5 log_block_checksum_is_ok_or_old_format(log_block);
6
7 if (no != scanned_no && checksum_is_ok) {
8- ulint blocks_in_group =
9- log_block_convert_lsn_to_no(
10+ ulint blocks_in_group;
11+
12+ if (no < scanned_no) {
13+ /* incompletely written log block, do nothing */
14+ finished = TRUE;
15+ break;
16+ }
17+
18+ blocks_in_group = log_block_convert_lsn_to_no(
19 #ifndef INNODB_VERSION_SHORT
20- ut_dulint_create(0, log_group_get_capacity(group))
21+ ut_dulint_create(0,
22+ log_group_get_capacity(group))
23 #else
24- log_group_get_capacity(group)
25+ log_group_get_capacity(group)
26 #endif
27 ) - 1;
28

Subscribers

People subscribed via source and target branches