Merge lp:~stewart/percona-server/bug1072573-5.5 into lp:percona-server/5.5

Proposed by Stewart Smith
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: 461
Merged at revision: 541
Proposed branch: lp:~stewart/percona-server/bug1072573-5.5
Merge into: lp:percona-server/5.5
Diff against target: 13 lines (+2/-1)
1 file modified
Percona-Server/storage/innobase/handler/i_s.cc (+2/-1)
To merge this branch: bzr merge lp:~stewart/percona-server/bug1072573-5.5
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
Review via email: mp+163833@code.launchpad.net
To post a comment you must log in.

OK but if 5.1 fix needs re-committing, then this one will need re-merging.

review: Needs Fixing
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Percona-Server/storage/innobase/handler/i_s.cc'
--- Percona-Server/storage/innobase/handler/i_s.cc 2013-04-08 06:26:11 +0000
+++ Percona-Server/storage/innobase/handler/i_s.cc 2013-05-15 05:07:35 +0000
@@ -2970,7 +2970,8 @@
2970 i_s_innodb_buffer_page_get_info(2970 i_s_innodb_buffer_page_get_info(
2971 &block->page, pool_id, block_id,2971 &block->page, pool_id, block_id,
2972 info_buffer + num_page);2972 info_buffer + num_page);
2973 mutex_exit(block_mutex);2973 if (block_mutex)
2974 mutex_exit(block_mutex);
2974 block_id++;2975 block_id++;
2975 num_page++;2976 num_page++;
2976 }2977 }

Subscribers

People subscribed via source and target branches