diff options
| author | Marko Mäkelä <marko.makela@oracle.com> | 2011-01-25 10:51:13 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@oracle.com> | 2011-01-25 10:51:13 +0200 |
| commit | 41375b0fa48c3879ee7ecaa5cca0fe8f0fe5fe2e (patch) | |
| tree | 732af417c0e2ad7de8af272b0d261daa6b5f091f /storage/innobase/include/buf0buf.h | |
| parent | 7f7e934f23cde651a0bc6575958e163d08806cfe (diff) | |
| parent | 60a622d1c1940f80829a4df312ff49a6feae265e (diff) | |
| download | mariadb-git-41375b0fa48c3879ee7ecaa5cca0fe8f0fe5fe2e.tar.gz | |
Merge mysql-5.1-innodb to mysql-5.5-innodb.
Diffstat (limited to 'storage/innobase/include/buf0buf.h')
| -rw-r--r-- | storage/innobase/include/buf0buf.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/innobase/include/buf0buf.h b/storage/innobase/include/buf0buf.h index 46cae25f0f5..7d57cc26288 100644 --- a/storage/innobase/include/buf0buf.h +++ b/storage/innobase/include/buf0buf.h @@ -276,9 +276,9 @@ UNIV_INTERN buf_block_t* buf_block_alloc( /*============*/ - buf_pool_t* buf_pool, /*!< buffer pool instance */ - ulint zip_size); /*!< in: compressed page size in bytes, - or 0 if uncompressed tablespace */ + buf_pool_t* buf_pool); /*!< in: buffer pool instance, + or NULL for round-robin selection + of the buffer pool */ /********************************************************************//** Frees a buffer block which does not contain a file page. */ UNIV_INLINE |