← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/include/buf0rea.h

Merge initial InnoDB+ import.

This was applied by generating a patch between MySQL 5.1.50 InnoDB plugin and
the just-merged innodb+ from mysql-trunk revision-id: vasil.dimov@oracle.com-20100422110752-1zowoqxel5xx3z2e

Then, some manual merge resolving and it worked. This should make it much
easier to merge the rest of InnoDB 1.1 and 1.2 from the mysql tree using
my bzr-reapply script.

This takes us to InnoDB 1.1.1(ish).

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/include/buf0rea.h
124
124
 
125
125
/** The size in pages of the area which the read-ahead algorithms read if
126
126
invoked */
127
 
#define BUF_READ_AHEAD_AREA                                     \
128
 
        ut_min(64, ut_2_power_up(buf_pool->curr_size / 32))
 
127
#define BUF_READ_AHEAD_AREA(b)                                  \
 
128
        ut_min(64, ut_2_power_up((b)->curr_size / 32))
129
129
 
130
130
/** @name Modes used in read-ahead @{ */
131
131
/** read only pages belonging to the insert buffer tree */