bzr push into mysql-trunk branch (tor.didriksen:3426 to 3427)

[Tor Didriksen]

 3427 Tor Didriksen	2011-08-31 [merge]
      merge 5.5 => trunk

    modified:
      mysql-test/valgrind.supp
 3426 Bjorn Munch	2011-08-31 [merge]
      null upmerge

=== modified file 'mysql-test/valgrind.supp'
--- a/mysql-test/valgrind.supp	2011-08-30 09:19:06 +0000
+++ b/mysql-test/valgrind.supp	2011-08-31 14:53:56 +0000
@@ -975,16 +975,17 @@
    fun:_Z8filesortP3THDP5TABLEP13st_sort_fieldjP10SQL_SELECTybPyS7_
 }
 
-## {
-##    Bug#12856915 VALGRIND FAILURE IN FILESORT/CREATE_SORT_INDEX / two
-##    Memcheck:Param
-##    write(buf)
-##    obj:*/libpthread*.so
-##    fun:my_write
-##    fun:my_b_flush_io_cache
-##    fun:_Z15merge_many_buffP13st_sort_paramPhP10st_buffpekPjP11st_io_cache
-##    fun:_Z8filesortP3THDP8st_tableP13st_sort_fieldjP10SQL_SELECTybPy
-## }
+{
+   Bug#12856915 VALGRIND FAILURE IN FILESORT/CREATE_SORT_INDEX / two
+   Memcheck:Param
+   write(buf)
+   obj:*/libpthread*.so
+   fun:my_write
+   fun:inline_mysql_file_write
+   fun:my_b_flush_io_cache
+   fun:_Z15merge_many_buffP13st_sort_paramPhP10st_buffpekPjP11st_io_cache
+   fun:_Z8filesortP3THDP5TABLEP13st_sort_fieldjP10SQL_SELECTybPyS7_
+}
 
 ## {
 ##    Bug#12856915 VALGRIND FAILURE IN FILESORT/CREATE_SORT_INDEX / three

No bundle (reason: useless for push emails).