bzr push into mysql-trunk branch (tor.didriksen:3427 to 3428) Bug#12856915

[Tor Didriksen]

 3428 Tor Didriksen	2011-09-01
      Bug#12856915 VALGRIND FAILURE IN FILESORT/CREATE_SORT_INDEX
      
      Post-push fix:
      Enable filesort pattern three, main.index_merge_myisam failed.

    modified:
      mysql-test/valgrind.supp
 3427 Tor Didriksen	2011-08-31 [merge]
      merge 5.5 => trunk

    modified:
      mysql-test/valgrind.supp
=== modified file 'mysql-test/valgrind.supp'
--- a/mysql-test/valgrind.supp	2011-08-31 14:53:56 +0000
+++ b/mysql-test/valgrind.supp	2011-09-01 06:02:34 +0000
@@ -987,13 +987,13 @@
    fun:_Z8filesortP3THDP5TABLEP13st_sort_fieldjP10SQL_SELECTybPyS7_
 }
 
-## {
-##    Bug#12856915 VALGRIND FAILURE IN FILESORT/CREATE_SORT_INDEX / three
-##    Memcheck:Param
-##    write(buf)
-##    obj:*/libpthread*.so
-##    fun:my_write
-##    fun:inline_mysql_file_write
-##    fun:my_b_flush_io_cache
-##    fun:_Z8filesortP3THDP5TABLEP13st_sort_fieldjP10SQL_SELECTybPy
-## }
+{
+   Bug#12856915 VALGRIND FAILURE IN FILESORT/CREATE_SORT_INDEX / three
+   Memcheck:Param
+   write(buf)
+   obj:*/libpthread*.so
+   fun:my_write
+   fun:inline_mysql_file_write
+   fun:my_b_flush_io_cache
+   fun:_Z8filesortP3THDP5TABLEP13st_sort_fieldjP10SQL_SELECTybPyS7_
+}

No bundle (reason: useless for push emails).