From: Marc Alff
Date: December 7 2010 3:04pm
Subject: bzr commit into mysql-trunk-bugfixing branch (marc.alff:3421)
List-Archive: http://lists.mysql.com/commits/126220
Message-Id: <201012071504.oB7E8FM8018515@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

#At file:///Users/malff/BZR_TREE/mysql-trunk-bugfixing-merge/ based on revid:luis.soares@stripped

 3421 Marc Alff	2010-12-07 [merge]
      Merge mysql-5.5-bugteam (revno 3173) --> mysql-trunk-bugfixing

    modified:
      mysql-test/valgrind.supp
=== modified file 'mysql-test/valgrind.supp'
--- a/mysql-test/valgrind.supp	2010-11-22 17:11:16 +0000
+++ b/mysql-test/valgrind.supp	2010-12-07 15:03:31 +0000
@@ -770,13 +770,16 @@
    fun:lf_hash_insert
 }
 
+#
+# Note that initialize_bucket() is reccursive,
+# can't provide more stack context.
+#
 {
    missing shutdown_performance_schema 3
    Memcheck:Leak
    fun:malloc
    fun:my_malloc
    fun:initialize_bucket
-   fun:lf_hash_search
 }
 
 {
@@ -785,6 +788,34 @@
    fun:malloc
    fun:my_malloc
    fun:_lf_dynarray_lvalue
+   fun:_lf_pinbox_get_pins
+   fun:lf_pinbox_get_pins
+}
+
+{
+   missing shutdown_performance_schema 5
+   Memcheck:Leak
+   fun:malloc
+   fun:my_malloc
+   fun:_lf_dynarray_lvalue
    fun:lf_hash_insert
 }
 
+{
+   missing shutdown_performance_schema 6
+   Memcheck:Leak
+   fun:malloc
+   fun:my_malloc
+   fun:_lf_dynarray_lvalue
+   fun:lf_hash_delete
+}
+
+{
+   missing shutdown_performance_schema 7
+   Memcheck:Leak
+   fun:malloc
+   fun:my_malloc
+   fun:_lf_dynarray_lvalue
+   fun:lf_hash_search
+}
+

No bundle (reason: revision is a merge).