bzr push into mysql-5.5 branch (tor.didriksen:3518 to 3519) Bug#12856915

[Tor Didriksen]

 3519 Tor Didriksen	2011-09-05
      Bug#12856915 VALGRIND FAILURE IN FILESORT/CREATE_SORT_INDEX
      Post-push fix:
      Replace fun:inline_mysql_file_write with '...' since it may be optimized away.

    modified:
      mysql-test/valgrind.supp
 3518 Nirbhay Choubey	2011-09-02
      BUG#11878394 - MYSQLD_SAFE TEST FOR ALREADY RUNNING PROCESS
                     FAILS, CAUSING CLOBBERED SOCKET
      
      A check for running mysqld instances was failing in mysqld_safe
      because of an incorrect shell command generated by cmake. The
      problem is that cmake retains the '\' of escaped double-quote,
      so the generated mysqld_safe script's command contained \" in
      the shell command, and hence the failure. 
      
      Fixed the command in scripts\CMakeLists.txt.
     @ scripts/CMakeLists.txt
        BUG#1878394 - MYSQLD_SAFE TEST FOR ALREADY RUNNING PROCESS
                      FAILS, CAUSING CLOBBERED SOCKET
        
        Removed the escaped quotes and grep for 'grep process' from
        the shell commands.

    modified:
      scripts/CMakeLists.txt
=== modified file 'mysql-test/valgrind.supp'
--- a/mysql-test/valgrind.supp	2011-08-31 14:45:52 +0000
+++ b/mysql-test/valgrind.supp	2011-09-05 14:04:33 +0000
@@ -880,13 +880,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_keysP13st_sort_paramPPhjP11st_io_cacheS4_
@@ -900,7 +903,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_SELECTybPy
@@ -912,7 +915,7 @@
    write(buf)
    obj:*/libpthread*.so
    fun:my_write
-   fun:inline_mysql_file_write
+   ...
    fun:my_b_flush_io_cache
    fun:_Z8filesortP3THDP5TABLEP13st_sort_fieldjP10SQL_SELECTybPy
 }

No bundle (reason: useless for push emails).