Merge lp:~akopytov/percona-server/bug997496-5.5 into lp:percona-server/5.5

Proposed by Alexey Kopytov
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: no longer in the source branch.
Merged at revision: 244
Proposed branch: lp:~akopytov/percona-server/bug997496-5.5
Merge into: lp:percona-server/5.5
Prerequisite: lp:~akopytov/percona-server/null-merge-from-5.1
Diff against target: 14 lines (+3/-1)
1 file modified
Percona-Server/storage/innobase/buf/buf0buf.c (+3/-1)
To merge this branch: bzr merge lp:~akopytov/percona-server/bug997496-5.5
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
Review via email: mp+105305@code.launchpad.net

This proposal supersedes a proposal from 2012-05-10.

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
1=== modified file 'Percona-Server/storage/innobase/buf/buf0buf.c'
2--- Percona-Server/storage/innobase/buf/buf0buf.c 2012-05-02 07:37:27 +0000
3+++ Percona-Server/storage/innobase/buf/buf0buf.c 2012-05-10 08:22:32 +0000
4@@ -57,7 +57,9 @@
5 /* prototypes for new functions added to ha_innodb.cc */
6 trx_t* innobase_get_trx();
7
8-inline void _increment_page_get_statistics(buf_block_t* block, trx_t* trx)
9+static inline
10+void
11+_increment_page_get_statistics(buf_block_t* block, trx_t* trx)
12 {
13 ulint block_hash;
14 ulint block_hash_byte;

Subscribers

People subscribed via source and target branches