Commit cc182a09 authored by Marko Mäkelä's avatar Marko Mäkelä

Merge a change from mysql-5.1-innodb:

------------------------------------------------------------
revno: 3475
revision-id: marko.makela@oracle.com-20100520130734-ueow9mn60czp7o4m
parent: marko.makela@oracle.com-20100520104042-ma2nsscqdvwoph8k
committer: Marko Mäkelä <marko.makela@oracle.com>
branch nick: 5.1-innodb
timestamp: Thu 2010-05-20 16:07:34 +0300
message:
  buf_LRU_free_block(): Correct an error in the comment.
parent 963b1986
...@@ -1442,11 +1442,11 @@ buf_LRU_make_block_old( ...@@ -1442,11 +1442,11 @@ buf_LRU_make_block_old(
Try to free a block. If bpage is a descriptor of a compressed-only Try to free a block. If bpage is a descriptor of a compressed-only
page, the descriptor object will be freed as well. page, the descriptor object will be freed as well.
NOTE: If this function returns BUF_LRU_FREED, it will not temporarily NOTE: If this function returns BUF_LRU_FREED, it will temporarily
release buf_pool->mutex. Furthermore, the page frame will no longer be release buf_pool_mutex. Furthermore, the page frame will no longer be
accessible via bpage. accessible via bpage.
The caller must hold buf_pool->mutex and buf_page_get_mutex(bpage) and The caller must hold buf_pool_mutex and buf_page_get_mutex(bpage) and
release these two mutexes after the call. No other release these two mutexes after the call. No other
buf_page_get_mutex() may be held when calling this function. buf_page_get_mutex() may be held when calling this function.
@return BUF_LRU_FREED if freed, BUF_LRU_CANNOT_RELOCATE or @return BUF_LRU_FREED if freed, BUF_LRU_CANNOT_RELOCATE or
...@@ -1460,7 +1460,7 @@ buf_LRU_free_block( ...@@ -1460,7 +1460,7 @@ buf_LRU_free_block(
compressed page of an uncompressed page */ compressed page of an uncompressed page */
ibool* buf_pool_mutex_released) ibool* buf_pool_mutex_released)
/*!< in: pointer to a variable that will /*!< in: pointer to a variable that will
be assigned TRUE if buf_pool->mutex be assigned TRUE if buf_pool_mutex
was temporarily released, or NULL */ was temporarily released, or NULL */
{ {
buf_page_t* b = NULL; buf_page_t* b = NULL;
......
...@@ -97,7 +97,7 @@ buf_LRU_insert_zip_clean( ...@@ -97,7 +97,7 @@ buf_LRU_insert_zip_clean(
Try to free a block. If bpage is a descriptor of a compressed-only Try to free a block. If bpage is a descriptor of a compressed-only
page, the descriptor object will be freed as well. page, the descriptor object will be freed as well.
NOTE: If this function returns BUF_LRU_FREED, it will not temporarily NOTE: If this function returns BUF_LRU_FREED, it will temporarily
release buf_pool->mutex. Furthermore, the page frame will no longer be release buf_pool->mutex. Furthermore, the page frame will no longer be
accessible via bpage. accessible via bpage.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment