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

Proposed by Laurynas Biveinis
Status: Merged
Approved by: Vadim Tkachenko
Approved revision: no longer in the source branch.
Merged at revision: 407
Proposed branch: lp:~laurynas-biveinis/percona-server/bug1100159-5.5
Merge into: lp:percona-server/5.5
Diff against target: 12 lines (+1/-1)
1 file modified
Percona-Server/storage/innobase/buf/buf0lru.c (+1/-1)
To merge this branch: bzr merge lp:~laurynas-biveinis/percona-server/bug1100159-5.5
Reviewer Review Type Date Requested Status
Vadim Tkachenko Approve
Review via email: mp+143533@code.launchpad.net

Description of the change

Trivial merge of bug 1100159 fix from 5.1.
http://jenkins.percona.com/job/percona-server-5.5-param/621/
No BT or ST, but is blocking BT 16274.

To post a comment you must log in.
Revision history for this message
Vadim Tkachenko (vadim-tk) :
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/buf/buf0lru.c'
2--- Percona-Server/storage/innobase/buf/buf0lru.c 2013-01-09 23:45:25 +0000
3+++ Percona-Server/storage/innobase/buf/buf0lru.c 2013-01-16 15:38:46 +0000
4@@ -1853,7 +1853,7 @@
5 || !buf_page_can_relocate(bpage)) {
6 not_freed:
7 if (b) {
8- buf_buddy_free(buf_pool, b, sizeof *b, TRUE);
9+ buf_page_free_descriptor(b);
10 }
11 if (!have_LRU_mutex)
12 mutex_exit(&buf_pool->LRU_list_mutex);

Subscribers

People subscribed via source and target branches