bzr push into mysql-trunk-innodb branch (marko.makela:3108 to 3109)

[marko.makela]

 3109 Marko Mäkelä	2010-05-20
      Merge a change from mysql-5.1-innodb:
      
      ------------------------------------------------------------
      revno: 3475
      revision-id: marko.makela@strippedow9mn60czp7o4m
      parent: marko.makela@stripped0520104042-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
 3108 Marko Mäkelä	2010-05-20
      Merge a change from mysql-5.1-innodb:
      
      TO DO: Enable this in CMake-based builds.
      
      ------------------------------------------------------------
      revno: 3474
      revision-id: marko.makela@strippedph8k
      parent: marko.makela@stripped-h38q02qxuvcowbtk
      committer: Marko Mäkelä <marko.makela@stripped>
      branch nick: 5.1-innodb
      timestamp: Thu 2010-05-20 13:40:42 +0300
      message:
        Bug#53593: Add some instrumentation to improve Valgrind sensitivity
      
        BUILD/*: Add valgrind_configs=--with-valgrind.
        BUILD/*: Remove -USAFEMALLOC from valgrind_flags.
      
        configure.in: Add AC_ARG_WITH(valgrind) and HAVE_VALGRIND.
      
        include/my_sys.h: Define a number of MEM_ wrappers for VALGRIND_ functions.
        include/my_sys.h: Make TRASH do MEM_UNDEFINED().
      
        include/m_string.h: Remove unused macro bzero_if_purify(A,B).
      
        _mymalloc(): Declare MEM_UNDEFINED() on the allocated memory.
      
        _myfree(): Declare MEM_NOACCESS() on the freed memory.
      
        storage/innobase/include/univ.i: Enable UNIV_DEBUG_VALGRIND based on
        HAVE_VALGRIND rather than HAVE_purify.
      
        Possible things to do:
         * In my_global.h, remove the defined(HAVE_purify) condition
           from the _WIN32 uint3korr().
         * In my_global.h *int*korr(), use | instead of +
           in order to keep the Valgrind V bits accurate
         * Consider replacing HAVE_purify with HAVE_VALGRIND
         * Use VALGRIND_CREATE_BLOCK, VALGRIND_DISCARD in mem_root and similar places

    modified:
      BUILD/SETUP.sh
      BUILD/build_mccge.sh
      BUILD/compile-amd64-valgrind-max
      BUILD/compile-pentium-icc-valgrind-max
      BUILD/compile-pentium-valgrind-max
      BUILD/compile-pentium-valgrind-max-no-ndb
      BUILD/compile-pentium64-valgrind-max
      configure.in
      include/m_string.h
      include/my_sys.h
      mysys/safemalloc.c
      storage/innobase/include/univ.i
=== modified file 'storage/innobase/buf/buf0lru.c'
--- a/storage/innobase/buf/buf0lru.c	revid:marko.makela@stripped0520114306-oz8mce7y8m7y6p1g
+++ b/storage/innobase/buf/buf0lru.c	revid:marko.makela@strippedzeun5jbhv24d
@@ -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:[e-mail]-20100520114306-oz8mce7y8m7y6p1g
+++ b/storage/innobase/include/buf0lru.h	revid:marko.makela@stripped0131632-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]