bzr commit into mysql-trunk-innodb branch (vasil.dimov:3481)

[vasil.dimov]

#At file:///usr/local/devel/bzrroot/server/mysql-trunk-innodb/ based on revid:vasil.dimov@stripped

 3481 Vasil Dimov	2011-02-07 [merge]
      Merge mysql-5.5-innodb -> mysql-trunk-innodb

    modified:
      mysql-test/valgrind.supp
=== modified file 'mysql-test/valgrind.supp'
--- a/mysql-test/valgrind.supp	revid:vasil.dimov@stripped
+++ b/mysql-test/valgrind.supp	revid:vasil.dimov@stripped
@@ -839,8 +839,8 @@
 {
    Bug 59874 Valgrind warning in InnoDB compression code
    Memcheck:Cond
-   obj:*/libz.so*
-   obj:*/libz.so*
+   fun:*
+   fun:*
    fun:deflate
    fun:btr_store_big_rec_extern_fields_func
    fun:row_ins_index_entry_low
@@ -854,8 +854,8 @@
 {
    In page0zip.c we have already checked that the memory is initialized before calling deflate()
    Memcheck:Cond
-   obj:*/libz.so*
-   obj:*/libz.so*
+   fun:*
+   fun:*
    fun:deflate
    fun:page_zip_compress
    fun:page_cur_insert_rec_zip_reorg

No bundle (reason: revision is a merge (you can force generation of a bundle with env var BZR_FORCE_BUNDLE=1)).