← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/include/mem0pool.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/mem0pool.h
100
100
/*==================*/
101
101
        mem_pool_t*     pool);  /*!< in: memory pool */
102
102
/********************************************************************//**
 
103
Reserves the mem pool mutex. */
 
104
UNIV_INTERN
 
105
void
 
106
mem_pool_mutex_enter(void);
 
107
/*======================*/
 
108
/********************************************************************//**
 
109
Releases the mem pool mutex. */
 
110
UNIV_INTERN
 
111
void
 
112
mem_pool_mutex_exit(void);
 
113
/*=====================*/
 
114
/********************************************************************//**
103
115
Validates a memory pool.
104
116
@return TRUE if ok */
105
117
UNIV_INTERN