bzr push into mysql-trunk branch (tor.didriksen:3421 to 3422)

[Tor Didriksen]

 3422 Tor Didriksen	2011-08-30 [merge]
      empty merge

 3421 Tor Didriksen	2011-08-30 [merge]
      local merge

    modified:
      mysql-test/r/group_by.result
      mysql-test/t/group_by.test
      sql/filesort.cc
=== modified file 'mysql-test/valgrind.supp'
--- a/mysql-test/valgrind.supp	2011-08-29 08:42:45 +0000
+++ b/mysql-test/valgrind.supp	2011-08-30 09:19:06 +0000
@@ -958,6 +958,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
@@ -967,8 +970,8 @@
    fun:inline_mysql_file_write
    fun:my_b_flush_io_cache
    fun:_my_b_write
-   fun:_ZL10write_keysP10Sort_paramPPhjP11st_io_cacheS4_
-   fun:_ZL13find_all_keysP10Sort_paramP10SQL_SELECTPPhP11st_io_cacheS6_P13Bounded_queueIhhEPy
+   fun:_Z*10write_keysP10Sort_paramPPhjP11st_io_cacheS4_
+   fun:_Z*13find_all_keysP10Sort_paramP10SQL_SELECTPPhP11st_io_cacheS6_P13Bounded_queueIhhEPy
    fun:_Z8filesortP3THDP5TABLEP13st_sort_fieldjP10SQL_SELECTybPyS7_
 }
 

No bundle (reason: useless for push emails).