Merge lp:~laurynas-biveinis/percona-server/bug1418996-5.5 into lp:percona-server/5.5

[Laurynas Biveinis]

Fix bug 1418996 (InnoDB lock monitor output is printed even if not
requested).

Currently lock_print_info_all_transactions prints lock info if either
innodb lock monitor is on, either innodb_show_locks_held is greater
than zero (the default value is ten). It should be printed when both
conditions hold instead.

http://jenkins.percona.com/job/percona-server-5.5-param/1084/

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== modified file 'storage/innobase/lock/lock0lock.c'
--- storage/innobase/lock/lock0lock.c	2014-02-14 07:44:36 +0000
+++ storage/innobase/lock/lock0lock.c	2015-02-09 10:52:56 +0000
@@ -4720,7 +4720,7 @@
 		}
 	}
 
-        if (!srv_print_innodb_lock_monitor && !srv_show_locks_held) {
+	if (!srv_print_innodb_lock_monitor || !srv_show_locks_held) {
 		nth_trx++;
 		goto loop;
 	}