Merge lp:~stewart/percona-xtrabackup/fix-local-shadows-global into lp:percona-xtrabackup/2.0

Proposed by Stewart Smith
Status: Merged
Merged at revision: 242
Proposed branch: lp:~stewart/percona-xtrabackup/fix-local-shadows-global
Merge into: lp:percona-xtrabackup/2.0
Diff against target: 24 lines (+3/-3)
1 file modified
xtrabackup.c (+3/-3)
To merge this branch: bzr merge lp:~stewart/percona-xtrabackup/fix-local-shadows-global
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) Approve
Review via email: mp+55691@code.launchpad.net

Description of the change

fixes a compiler warning I hit when merging latest percona-xtrabackup tree into Drizzle.

To post a comment you must log in.
Revision history for this message
Alexey Kopytov (akopytov) :
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-28 15:28:40 +0000
3+++ xtrabackup.c 2011-03-31 06:49:15 +0000
4@@ -4502,7 +4502,7 @@
5 {
6 mtr_t local_mtr;
7 page_t* root;
8- ulint n;
9+ ulint page_level;
10
11 mtr_start(&local_mtr);
12
13@@ -4513,9 +4513,9 @@
14 mtr_x_lock(&(index->lock), &local_mtr);
15 root = btr_root_get(index, &local_mtr);
16 #endif
17- n = btr_page_get_level(root, &local_mtr);
18+ page_level = btr_page_get_level(root, &local_mtr);
19
20- xtrabackup_stats_level(index, n);
21+ xtrabackup_stats_level(index, page_level);
22
23 mtr_commit(&local_mtr);
24 }

Subscribers

People subscribed via source and target branches