bzr commit into mysql-trunk-innodb branch (marko.makela:3109)

[marko.makela]

#At file:///home/marko/innobase/dev/mysql/5.5-innodb/ based on revid:marko.makela@stripped7y8m7y6p1g

 3109 Marko Mäkelä	2010-05-20
      Merge a change from mysql-5.1-innodb:
      
      ------------------------------------------------------------
      revno: 3475
      revision-id: marko.makela@stripped520130734-ueow9mn60czp7o4m
      parent: [e-mail]-20100520104042-ma2nsscqdvwoph8k
      committer: Marko Mäkelä <marko.makela@stripped>
      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.

    modified:
      storage/innobase/buf/buf0lru.c
      storage/innobase/include/buf0lru.h
=== modified file 'storage/innobase/buf/buf0lru.c'
--- a/storage/innobase/buf/buf0lru.c	revid:[e-mail]-20100520114306-oz8mce7y8m7y6p1g
+++ b/storage/innobase/buf/buf0lru.c	revid:marko.makela@stripped0131632-qvwrzeun5jbhv24d
@@ -1442,11 +1442,11 @@ buf_LRU_make_block_old(
 Try to free a block.  If bpage is a descriptor of a compressed-only
 page, the descriptor object will be freed as well.
 
-NOTE: If this function returns BUF_LRU_FREED, it will not temporarily
-release buf_pool->mutex.  Furthermore, the page frame will no longer be
+NOTE: If this function returns BUF_LRU_FREED, it will temporarily
+release buf_pool_mutex.  Furthermore, the page frame will no longer be
 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
 buf_page_get_mutex() may be held when calling this function.
 @return BUF_LRU_FREED if freed, BUF_LRU_CANNOT_RELOCATE or
@@ -1460,7 +1460,7 @@ buf_LRU_free_block(
 				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
+				be assigned TRUE if buf_pool_mutex
 				was temporarily released, or NULL */
 {
 	buf_page_t*	b = NULL;

=== modified file 'storage/innobase/include/buf0lru.h'
--- a/storage/innobase/include/buf0lru.h	revid:marko.makela@stripped
+++ b/storage/innobase/include/buf0lru.h	revid:[e-mail]-20100520131632-qvwrzeun5jbhv24d
@@ -97,7 +97,7 @@ buf_LRU_insert_zip_clean(
 Try to free a block.  If bpage is a descriptor of a compressed-only
 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
 accessible via bpage.
 

Attachment: [text/bzr-bundle] bzr/[e-mail]