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/buf0lru.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/buf0lru.h')
| -rw-r--r-- | storage/innobase/include/buf0lru.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/storage/innobase/include/buf0lru.h b/storage/innobase/include/buf0lru.h index 7bcec633d9c..9b150188b03 100644 --- a/storage/innobase/include/buf0lru.h +++ b/storage/innobase/include/buf0lru.h @@ -111,12 +111,9 @@ enum buf_lru_free_block_status buf_LRU_free_block( /*===============*/ buf_page_t* bpage, /*!< in: block to be freed */ - ibool zip, /*!< in: TRUE if should remove also the + ibool zip) /*!< in: TRUE if should remove also the compressed page of an uncompressed page */ - ibool* buf_pool_mutex_released); - /*!< in: pointer to a variable that will - be assigned TRUE if buf_pool->mutex - was temporarily released, or NULL */ + __attribute__((nonnull)); /******************************************************************//** Try to free a replaceable block. @return TRUE if found and freed */ @@ -153,9 +150,8 @@ UNIV_INTERN buf_block_t* buf_LRU_get_free_block( /*===================*/ - buf_pool_t* buf_pool, /*!< in: preferred buffer pool */ - ulint zip_size); /*!< in: compressed page size in bytes, - or 0 if uncompressed tablespace */ + buf_pool_t* buf_pool) /*!< in/out: buffer pool instance */ + __attribute__((nonnull,warn_unused_result)); /******************************************************************//** Puts a block back to the free list. */ |