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

Proposed by Laurynas Biveinis on 2015-02-09
Status: Merged
Approved by: Laurynas Biveinis on 2015-02-09
Approved revision: 723
Merged at revision: 731
Proposed branch: lp:~laurynas-biveinis/percona-server/bug1418996-5.5
Merge into: lp:percona-server/5.5
Diff against target: 12 lines (+1/-1)
1 file modified
storage/innobase/lock/lock0lock.c (+1/-1)
To merge this branch: bzr merge lp:~laurynas-biveinis/percona-server/bug1418996-5.5
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve on 2015-02-09
Review via email: mp+249050@code.launchpad.net

Description of the change

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/

To post a comment you must log in.
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'storage/innobase/lock/lock0lock.c'
2--- storage/innobase/lock/lock0lock.c 2014-02-14 07:44:36 +0000
3+++ storage/innobase/lock/lock0lock.c 2015-02-09 10:52:56 +0000
4@@ -4720,7 +4720,7 @@
5 }
6 }
7
8- if (!srv_print_innodb_lock_monitor && !srv_show_locks_held) {
9+ if (!srv_print_innodb_lock_monitor || !srv_show_locks_held) {
10 nth_trx++;
11 goto loop;
12 }

Subscribers

People subscribed via source and target branches