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

[Tor Didriksen]

 3413 Tor Didriksen	2011-09-19
      Bug#12856915 VALGRIND FAILURE IN FILESORT/CREATE_SORT_INDEX
      
      Another suppression pattern for rpl.rpl_checksum_cache on redhat.

    modified:
      mysql-test/valgrind.supp
 3412 Tor Didriksen	2011-09-19
      Bug#12981106 ADD OPTIMIZER TRACES FOR FOR FILESORT
      
      Implements the filesort() part of WL#5834
     @ mysql-test/suite/opt_trace/include/filesort_pq.inc
        New tests.
     @ mysql-test/suite/opt_trace/r/filesort_pq.result
        New tests.
     @ sql/filesort.cc
        Add some tracing.
        Remove TEST_filesort(), add trace_filesort_information()
     @ sql/opt_trace.h
        Add some more add() member functions.
        Declare add(const char*) and add(const char*, const char*) as private,
        to avoid type conversion and calling add(const char*, bool) instead.
     @ sql/sql_test.cc
        Remove TEST_filesort()
     @ sql/sql_test.h
        Remove TEST_filesort()

    added:
      mysql-test/suite/opt_trace/include/filesort_pq.inc
      mysql-test/suite/opt_trace/r/filesort_pq.result
      mysql-test/suite/opt_trace/t/filesort_pq.test
    modified:
      mysql-test/suite/opt_trace/r/general2_no_prot.result
      mysql-test/suite/opt_trace/r/general2_ps_prot.result
      mysql-test/suite/opt_trace/r/general_no_prot_none.result
      mysql-test/suite/opt_trace/r/general_ps_prot_none.result
      mysql-test/suite/opt_trace/r/range_no_prot.result
      mysql-test/suite/opt_trace/r/range_ps_prot.result
      sql/filesort.cc
      sql/opt_range.cc
      sql/opt_trace.h
      sql/sql_test.cc
      sql/sql_test.h
=== modified file 'mysql-test/valgrind.supp'
--- a/mysql-test/valgrind.supp	2011-09-16 07:18:30 +0000
+++ b/mysql-test/valgrind.supp	2011-09-19 14:08:30 +0000
@@ -1001,6 +1001,19 @@
    fun:_Z8filesortP3THDP5TABLEP13st_sort_fieldjP10SQL_SELECTybPyS7_
 }
 
+{
+   Bug#12856915 VALGRIND FAILURE IN FILESORT/CREATE_SORT_INDEX / four
+   Memcheck:Param
+   write(buf)
+   obj:*/libpthread*.so
+   fun:my_write
+   ...
+   fun:my_b_flush_io_cache
+   fun:_my_b_write
+   fun:_Z*10write_keysP10Sort_paramPPhjP11st_io_cacheS4_
+   fun:_Z8filesortP3THDP5TABLEP13st_sort_fieldjP10SQL_SELECTybPyS7_
+}
+
 # Syscall param write(buf) points to uninitialised byte(s)
 # The '...' wildcard is for 'fun:inline_mysql_file_write' which *may*
 # be inlined.

No bundle (reason: useless for push emails).