merge 5.1 => 5.5

mysql-test/valgrind.supp

@@ -877,6 +877,9 @@
    fun:buf_buddy_free
 }
 
+# Note the wildcard in the (mangled) function signatures of
+# write_keys() and find_all_keys().
+# They both return ha_rows, which is platform dependent.
 {
    Bug#12856915 VALGRIND FAILURE IN FILESORT/CREATE_SORT_INDEX / one
    Memcheck:Param
@@ -886,8 +889,8 @@
    fun:inline_mysql_file_write
    fun:my_b_flush_io_cache
    fun:_my_b_write
-   fun:_ZL10write_keysP13st_sort_paramPPhjP11st_io_cacheS4_
-   fun:_ZL13find_all_keysP13st_sort_paramP10SQL_SELECTPPhP11st_io_cacheS6_S6_
+   fun:_Z*10write_keysP13st_sort_paramPPhjP11st_io_cacheS4_
+   fun:_Z*13find_all_keysP13st_sort_paramP10SQL_SELECTPPhP11st_io_cacheS6_S6_
    fun:_Z8filesortP3THDP5TABLEP13st_sort_fieldjP10SQL_SELECTybPy
 }