Merge lp:~stewart/percona-xtrabackup/gcc46-warnings-backport into lp:percona-xtrabackup/2.0

Proposed by Stewart Smith on 2011-04-11
Status: Merged
Merged at revision: 244
Proposed branch: lp:~stewart/percona-xtrabackup/gcc46-warnings-backport
Merge into: lp:percona-xtrabackup/2.0
Diff against target: 103 lines (+0/-23)
1 file modified
xtrabackup.c (+0/-23)
To merge this branch: bzr merge lp:~stewart/percona-xtrabackup/gcc46-warnings-backport
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) 2011-04-11 Approve on 2011-04-13
Review via email: mp+57096@code.launchpad.net

Description of the change

backporting lp:~linuxjedi/drizzle/trunk-bug-748064 fixes from Drizzle for GCC 4.6 build (needed for Fedora 15)

To post a comment you must log in.
Alexey Kopytov (akopytov) wrote :

Looks good, thanks!

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 2011-03-31 06:45:03 +0000
3+++ xtrabackup.c 2011-04-11 00:46:24 +0000
4@@ -2438,7 +2438,6 @@
5 ibool success;
6 byte* page;
7 byte* buf2 = NULL;
8- LSN64 flush_lsn;
9 IB_INT64 file_size;
10 IB_INT64 offset;
11 ulint page_in_buffer;
12@@ -2675,11 +2674,6 @@
13 if (!success) {
14 goto error;
15 }
16- flush_lsn = MACH_READ_64(page + FIL_PAGE_FILE_FLUSH_LSN);
17- /* check current flush lsn newer than checkpoint@start */
18-// if (ut_dulint_cmp(backup_start_checkpoint, flush_lsn) >= 0) {
19-// goto error;
20-// }
21
22 file_size = os_file_get_size_as_iblonglong(src_file);
23
24@@ -2890,8 +2884,6 @@
25 {
26 /* definition from recv_recovery_from_checkpoint_start() */
27 log_group_t* group;
28- log_group_t* up_to_date_group;
29- LSN64 old_scanned_lsn;
30 LSN64 group_scanned_lsn;
31 LSN64 contiguous_lsn;
32
33@@ -2913,9 +2905,6 @@
34 LSN64 start_lsn;
35 LSN64 end_lsn;
36
37-
38- old_scanned_lsn = from_lsn;
39-
40 /* reference recv_group_scan_log_recs() */
41 finished = FALSE;
42
43@@ -2938,7 +2927,6 @@
44 ulint no;
45 LSN64 scanned_lsn;
46 ulint data_len;
47- ibool more_data;
48
49 ulint scanned_checkpoint_no = 0;
50
51@@ -2946,7 +2934,6 @@
52
53 log_block = log_sys->buf;
54 scanned_lsn = start_lsn;
55- more_data = FALSE;
56
57 while (log_block < log_sys->buf + RECV_SCAN_SIZE && !finished) {
58
59@@ -3124,12 +3111,6 @@
60
61
62 group->scanned_lsn = group_scanned_lsn;
63-
64- if (ut_dulint_cmp(old_scanned_lsn, group_scanned_lsn) < 0) {
65- /* We found a more up-to-date group */
66-
67- up_to_date_group = group;
68- }
69
70 #ifndef INNODB_VERSION_SHORT
71 fprintf(stderr, ">> log scanned up to (%lu %lu)\n",group->scanned_lsn.high,group->scanned_lsn.low);
72@@ -4147,7 +4128,6 @@
73 ulint space_id;
74 ulint page_no;
75 ulint offset;
76- ulint extern_len;
77 byte* blob_header;
78 ulint part_len;
79 mtr_t local_mtr;
80@@ -4165,7 +4145,6 @@
81 space_id = mach_read_from_4(data + local_len + BTR_EXTERN_SPACE_ID);
82 page_no = mach_read_from_4(data + local_len + BTR_EXTERN_PAGE_NO);
83 offset = mach_read_from_4(data + local_len + BTR_EXTERN_OFFSET);
84- extern_len = mach_read_from_4(data + local_len + BTR_EXTERN_LEN + 4);
85
86 if (offset != FIL_PAGE_DATA)
87 fprintf(stderr, "\nWarning: several record may share same external page.\n");
88@@ -4561,7 +4540,6 @@
89
90 LSN64 max_no;
91 LSN64 max_lsn;
92- ulint max_field;
93 LSN64 checkpoint_no;
94
95 ulint fold;
96@@ -4697,7 +4675,6 @@
97 if (ut_dulint_cmp(checkpoint_no, max_no) >= 0) {
98 max_no = checkpoint_no;
99 max_lsn = MACH_READ_64(log_buf + field + LOG_CHECKPOINT_LSN);
100- max_field = field;
101 /*
102 mach_write_to_4(log_buf + field + LOG_CHECKPOINT_OFFSET,
103 LOG_FILE_HDR_SIZE + ut_dulint_minus(max_lsn,

Subscribers

People subscribed via source and target branches