bzr push into mysql-trunk branch (marc.alff:3595 to 3596)

[Marc Alff]

 3596 Marc Alff	2011-02-04 [merge]
      Merge mysql-5.5 --> mysql-trunk

    modified:
      mysql-test/valgrind.supp
 3595 Luis Soares	2011-02-04 [merge]
      BUG#59147: automerge mysql-5.5 into mysql-trunk.

    modified:
      mysql-test/include/rpl_sync.inc
      mysql-test/suite/rpl/r/rpl_circular_for_4_hosts.result
      mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test
=== modified file 'mysql-test/valgrind.supp'
--- a/mysql-test/valgrind.supp	2011-01-18 11:09:49 +0000
+++ b/mysql-test/valgrind.supp	2011-02-04 15:30:51 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Library General Public
@@ -806,7 +806,6 @@
    fun:my_malloc
    fun:_lf_dynarray_lvalue
    fun:_lf_pinbox_get_pins
-   fun:lf_pinbox_get_pins
 }
 
 {


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