bzr push into mysql-5.1 branch (tor.didriksen:3596)

[Tor Didriksen]

 3596 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-25 08:38:07 +0000
+++ b/mysql-test/valgrind.supp	2011-08-30 08:19:36 +0000
@@ -792,6 +792,9 @@
    fun:row_drop_table_for_mysql
 }
 
+# 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
@@ -800,8 +803,8 @@
    fun:my_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:_Z8filesortP3THDP8st_tableP13st_sort_fieldjP10SQL_SELECTybPy
 }
 

No bundle (reason: useless for push emails).