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

Proposed by Laurynas Biveinis
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: no longer in the source branch.
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
Review via email: mp+249051@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Laurynas Biveinis (laurynas-biveinis) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'storage/innobase/lock/lock0lock.cc'
--- storage/innobase/lock/lock0lock.cc 2014-12-16 06:00:17 +0000
+++ storage/innobase/lock/lock0lock.cc 2015-02-09 10:54:15 +0000
@@ -5375,7 +5375,7 @@
5375 }5375 }
5376 }5376 }
53775377
5378 if (!srv_print_innodb_lock_monitor && !srv_show_locks_held) {5378 if (!srv_print_innodb_lock_monitor || !srv_show_locks_held) {
5379 nth_trx++;5379 nth_trx++;
5380 goto loop;5380 goto loop;
5381 }5381 }

Subscribers

People subscribed via source and target branches