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

[Stewart Smith]

http://jenkins.percona.com/job/percona-server-5.1-param/536/

(commit does contain bug ref, maybe the MP wasn't showing it)

[Laurynas Biveinis (laurynas-biveinis)]

Please add a bug ref to the commit message and link the branch.

review: Needs Fixing

[Stewart Smith (stewart)]

Laurynas Biveinis <email address hidden> writes:
> Please add a bug ref to the commit message and link the branch.

Launchpad may be lagging/gotten it wrong, as there is the "fixes: ..."
thing in the commit.
--
Stewart Smith

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== modified file 'Percona-Server/storage/innodb_plugin/handler/i_s.cc'
--- Percona-Server/storage/innodb_plugin/handler/i_s.cc	2013-05-31 09:06:13 +0000
+++ Percona-Server/storage/innodb_plugin/handler/i_s.cc	2013-06-21 00:30:38 +0000
@@ -5108,7 +5108,8 @@
 				i_s_innodb_buffer_page_get_info(
 					&block->page, block_id,
 					info_buffer + num_page);
-				mutex_exit(block_mutex);
+				if (block_mutex)
+					mutex_exit(block_mutex);
 				block_id++;
 				num_page++;
 			}