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

Proposed by Stewart Smith on 2013-05-15
Status: Merged
Approved by: Laurynas Biveinis on 2013-06-21
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) 2013-05-15 Approve on 2013-06-21
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
1=== modified file 'Percona-Server/storage/innobase/handler/i_s.cc'
2--- Percona-Server/storage/innobase/handler/i_s.cc 2013-04-08 06:26:11 +0000
3+++ Percona-Server/storage/innobase/handler/i_s.cc 2013-05-15 05:07:35 +0000
4@@ -2970,7 +2970,8 @@
5 i_s_innodb_buffer_page_get_info(
6 &block->page, pool_id, block_id,
7 info_buffer + num_page);
8- mutex_exit(block_mutex);
9+ if (block_mutex)
10+ mutex_exit(block_mutex);
11 block_id++;
12 num_page++;
13 }

Subscribers

People subscribed via source and target branches