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

Proposed by Alexey Kopytov
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: no longer in the source branch.
Merged at revision: 579
Proposed branch: lp:~akopytov/percona-xtrabackup/bug1211173-2.0
Merge into: lp:percona-xtrabackup/2.0
Diff against target: 64 lines (+24/-10)
2 files modified
src/xtrabackup.cc (+10/-10)
test/t/server_version.sh (+14/-0)
To merge this branch: bzr merge lp:~akopytov/percona-xtrabackup/bug1211173-2.0
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
Review via email: mp+179636@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Laurynas Biveinis (laurynas-biveinis) :
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-08-07 06:43:31 +0000
3+++ src/xtrabackup.cc 2013-08-12 07:43:09 +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,"
40
41=== modified file 'test/t/server_version.sh'
42--- test/t/server_version.sh 2013-05-17 06:40:07 +0000
43+++ test/t/server_version.sh 2013-08-12 07:43:09 +0000
44@@ -4,6 +4,20 @@
45
46 . inc/common.sh
47
48+# This test can only work when the xtrabackup binary autodetected by
49+# innobackupex matches the binary built for this configuration, i.e. with
50+# XB_BUILD=(xtradb51|xtradb55|xtradb56|innodb56)
51+
52+case "$XB_BUILD" in
53+ "xtradb51" | "xtradb55" | "xtradb56" | "innodb56")
54+ ;;
55+ *)
56+ echo "Requires (xtradb51|xtradb55|xtradb56|innodb56) \
57+build configuration" >>$SKIPPED_REASON
58+ exit $SKIPPED_EXIT_CODE
59+ ;;
60+esac
61+
62 start_server
63
64 # Remove the explicit --ibbackup option from IB_ARGS

Subscribers

People subscribed via source and target branches