From: Marc Alff
Date: June 11 2012 10:03am
Subject: bzr push into mysql-trunk branch (marc.alff:3988)
List-Archive: http://lists.mysql.com/commits/144188
Message-Id: <201206111003.q5BA3ewv007524@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3988 Marc Alff	2012-06-11 [merge]
      Local merge

    modified:
      include/my_md5.h
      mysql-test/collections/mysql-trunk.release
      sql/item_strfunc.cc
      sql/table.cc
      storage/innobase/dict/dict0stats.cc
=== modified file 'mysql-test/valgrind.supp'
--- a/mysql-test/valgrind.supp	2012-05-31 16:21:37 +0000
+++ b/mysql-test/valgrind.supp	2012-06-11 10:01:37 +0000
@@ -799,27 +799,14 @@
 }
 
 {
-   missing shutdown_performance_schema 8a
+   missing shutdown_performance_schema 8
    Memcheck:Leak
    fun:malloc
    fun:my_malloc
    fun:_Z22add_pfs_instr_to_arrayPKcS0_
    fun:mysqld_get_one_option
    fun:handle_options
-   fun:_Z11mysqld_mainiPPc
-   fun:main
-}
-
-{
-   missing shutdown_performance_schema 8b
-   Memcheck:Leak
-   fun:malloc
-   fun:my_malloc
-   fun:_Z22add_pfs_instr_to_arrayPKcS0_
-   fun:mysqld_get_one_option
-   fun:handle_options
-   fun:_Z11mysqld_mainiPPc
-   fun:(below main)
+   fun:_Z20handle_early_optionsv
 }
 
 {

No bundle (reason: useless for push emails).