Merge lp:~laurynas-biveinis/percona-server/bug1100178-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: 313
Proposed branch: lp:~laurynas-biveinis/percona-server/bug1100178-5.6
Merge into: lp:percona-server/5.6
Diff against target: 15 lines (+4/-2)
1 file modified
Percona-Server/storage/innobase/lock/lock0lock.cc (+4/-2)
To merge this branch: bzr merge lp:~laurynas-biveinis/percona-server/bug1100178-5.6
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
George Ormond Lorch III (community) g2 Approve
Review via email: mp+144016@code.launchpad.net
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
Laurynas Biveinis (laurynas-biveinis) wrote :

Self-approving as the 5.1/5.5 MPs including this fix have been approved.

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.cc'
2--- Percona-Server/storage/innobase/lock/lock0lock.cc 2012-12-04 08:24:59 +0000
3+++ Percona-Server/storage/innobase/lock/lock0lock.cc 2013-01-20 12:01:24 +0000
4@@ -5315,8 +5315,10 @@
5
6 mtr_start(&mtr);
7
8- buf_page_get_with_no_latch(
9- space, zip_size, page_no, &mtr);
10+ buf_page_get_gen(space, zip_size, page_no,
11+ RW_NO_LATCH, NULL,
12+ BUF_GET_POSSIBLY_FREED,
13+ __FILE__, __LINE__, &mtr);
14
15 mtr_commit(&mtr);
16

Subscribers

People subscribed via source and target branches