Merge mysql-5.1-innodb -> mysql-5.5-innodb

mysql-test/valgrind.supp

@@ -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