bzr push into mysql-trunk branch (tor.didriksen:3432 to 3433)

[Tor Didriksen]

 3433 Tor Didriksen	2011-09-05 [merge]
      merge 5.5 => trunk

    modified:
      mysql-test/valgrind.supp
 3432 Nirbhay Choubey	2011-09-02 [merge]
      Local merge of fix for bug#11878394 from mysql-5.5.

    modified:
      scripts/CMakeLists.txt
=== modified file 'mysql-test/valgrind.supp'
--- a/mysql-test/valgrind.supp	2011-09-01 06:02:34 +0000
+++ b/mysql-test/valgrind.supp	2011-09-05 14:13:27 +0000
@@ -961,13 +961,16 @@
 # Note the wildcard in the (mangled) function signatures of
 # write_keys() and find_all_keys().
 # They both return ha_rows, which is platform dependent.
+#
+# The '...' wildcards are for 'fun:inline_mysql_file_write' which *may*
+# be inlined.
 {
    Bug#12856915 VALGRIND FAILURE IN FILESORT/CREATE_SORT_INDEX / one
    Memcheck:Param
    write(buf)
    obj:*/libpthread*.so
    fun:my_write
-   fun:inline_mysql_file_write
+   ...
    fun:my_b_flush_io_cache
    fun:_my_b_write
    fun:_Z*10write_keysP10Sort_paramPPhjP11st_io_cacheS4_
@@ -981,7 +984,7 @@
    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_
@@ -993,7 +996,7 @@
    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).