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

Proposed by Laurynas Biveinis on 2015-02-09
Status: Merged
Approved by: Laurynas Biveinis on 2015-02-09
Approved revision: 737
Merged at revision: 739
Proposed branch: lp:~laurynas-biveinis/percona-server/bug1418996-5.6
Merge into: lp:percona-server/5.6
Diff against target: 12 lines (+1/-1)
1 file modified
storage/innobase/lock/lock0lock.cc (+1/-1)
To merge this branch: bzr merge lp:~laurynas-biveinis/percona-server/bug1418996-5.6
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve on 2015-02-09
Review via email: mp+249051@code.launchpad.net
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.cc'
2--- storage/innobase/lock/lock0lock.cc 2014-12-16 06:00:17 +0000
3+++ storage/innobase/lock/lock0lock.cc 2015-02-09 10:54:15 +0000
4@@ -5375,7 +5375,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