Percona Server moved to https://jira.percona.com/projects/PS

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

  1. bug1100178-1100643-5.5
  2. Merge into 5.5
Proposed by Laurynas Biveinis
Status: Merged
Approved by: Stewart Smith
Approved revision: 403
Merged at revision: 421
Proposed branch: lp:~laurynas-biveinis/percona-server/bug1100178-1100643-5.5
Merge into: lp:percona-server/5.5
Diff against target: 25 lines (+10/-6)
1 file modified
Percona-Server/storage/innobase/lock/lock0lock.c (+10/-6)
To merge this branch: bzr merge lp:~laurynas-biveinis/percona-server/bug1100178-1100643-5.5
Reviewer Review Type Date Requested Status
Stewart Smith (community) Approve
George Ormond Lorch III g2 Approve
Review via email: mp+144015@code.launchpad.net

Description of the change

Merge bug 1100178 and bug 1100643 fixes from 5.1.
http://jenkins.percona.com/job/percona-server-5.5-param/632/

To post a comment you must log in.
Revision history for this message
George Ormond Lorch III (gl-az) wrote :

Looks good...

review: Approve (g2)
Revision history for this message
Stewart Smith (stewart) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Percona-Server/storage/innobase/lock/lock0lock.c'
2--- Percona-Server/storage/innobase/lock/lock0lock.c 2012-10-11 14:18:34 +0000
3+++ Percona-Server/storage/innobase/lock/lock0lock.c 2013-01-20 11:58:22 +0000
4@@ -4658,12 +4658,16 @@
5
6 lock_mutex_exit_kernel();
7
8- mtr_start(&mtr);
9-
10- buf_page_get_with_no_latch(space, zip_size,
11- page_no, &mtr);
12-
13- mtr_commit(&mtr);
14+ if (srv_show_verbose_locks) {
15+ mtr_start(&mtr);
16+
17+ buf_page_get_gen(space, zip_size, page_no,
18+ RW_NO_LATCH, NULL,
19+ BUF_GET_POSSIBLY_FREED,
20+ __FILE__, __LINE__, &mtr);
21+
22+ mtr_commit(&mtr);
23+ }
24
25 load_page_first = FALSE;
26

Subscribers

People subscribed via source and target branches