From: Marc Alff
Date: November 22 2010 5:11pm
Subject: bzr push into mysql-trunk-bugfixing branch (marc.alff:3385 to 3386)
List-Archive: http://lists.mysql.com/commits/124663
Message-Id: <201011221712.oAM60eN0019273@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3386 Marc Alff	2010-11-22
      Supressed memory leaks in the LF_HASH, expected since shutdown_performance_schema() is not called.

    modified:
      mysql-test/valgrind.supp
 3385 Davi Arnaut	2010-11-22 [merge]
       Merge of mysql-5.5-bugteam into mysql-trunk-bugfixing.

    modified:
      mysql-test/suite/sys_vars/r/shared_memory_base_name_basic.result
      mysql-test/suite/sys_vars/t/shared_memory_base_name_basic.test
      sql/sql_show.cc
=== modified file 'mysql-test/valgrind.supp'
--- a/mysql-test/valgrind.supp	2010-09-28 00:32:57 +0000
+++ b/mysql-test/valgrind.supp	2010-11-22 17:11:16 +0000
@@ -777,6 +777,14 @@
    fun:my_malloc
    fun:initialize_bucket
    fun:lf_hash_search
-   fun:_Z19find_or_create_fileP10PFS_threadP14PFS_file_classPKcj
+}
+
+{
+   missing shutdown_performance_schema 4
+   Memcheck:Leak
+   fun:malloc
+   fun:my_malloc
+   fun:_lf_dynarray_lvalue
+   fun:lf_hash_insert
 }
 

No bundle (reason: useless for push emails).