From: Tor Didriksen
Date: August 29 2011 9:18am
Subject: bzr push into mysql-trunk branch (tor.didriksen:3415)
List-Archive: http://lists.mysql.com/commits/140831
Message-Id: <201108290918.p7T9IQKO032190@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3415 Tor Didriksen	2011-08-29 [merge]
      local merge

    modified:
      storage/innobase/btr/btr0btr.c
      storage/innobase/btr/btr0cur.c
      storage/innobase/buf/buf0buf.c
      storage/innobase/fsp/fsp0fsp.c
      storage/innobase/include/btr0btr.h
      storage/innobase/include/btr0cur.h
      storage/innobase/include/buf0buf.h
      storage/innobase/include/fsp0fsp.h
      storage/innobase/include/mtr0mtr.h
      storage/innobase/include/mtr0mtr.ic
      storage/innobase/include/sync0sync.ic
      storage/innobase/mtr/mtr0mtr.c
      storage/innobase/row/row0ins.c
      storage/innobase/row/row0row.c
      storage/innobase/row/row0upd.c
      storage/innobase/trx/trx0undo.c
=== modified file 'mysql-test/valgrind.supp'
--- a/mysql-test/valgrind.supp	2011-06-30 15:50:45 +0000
+++ b/mysql-test/valgrind.supp	2011-08-29 08:42:45 +0000
@@ -957,3 +957,39 @@
    fun:buf_buddy_free_low
    fun:buf_buddy_free
 }
+
+{
+   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:_ZL10write_keysP10Sort_paramPPhjP11st_io_cacheS4_
+   fun:_ZL13find_all_keysP10Sort_paramP10SQL_SELECTPPhP11st_io_cacheS6_P13Bounded_queueIhhEPy
+   fun:_Z8filesortP3THDP5TABLEP13st_sort_fieldjP10SQL_SELECTybPyS7_
+}
+
+## {
+##    Bug#12856915 VALGRIND FAILURE IN FILESORT/CREATE_SORT_INDEX / two
+##    Memcheck:Param
+##    write(buf)
+##    obj:*/libpthread*.so
+##    fun:my_write
+##    fun:my_b_flush_io_cache
+##    fun:_Z15merge_many_buffP13st_sort_paramPhP10st_buffpekPjP11st_io_cache
+##    fun:_Z8filesortP3THDP8st_tableP13st_sort_fieldjP10SQL_SELECTybPy
+## }
+
+## {
+##    Bug#12856915 VALGRIND FAILURE IN FILESORT/CREATE_SORT_INDEX / three
+##    Memcheck:Param
+##    write(buf)
+##    obj:*/libpthread*.so
+##    fun:my_write
+##    fun:inline_mysql_file_write
+##    fun:my_b_flush_io_cache
+##    fun:_Z8filesortP3THDP5TABLEP13st_sort_fieldjP10SQL_SELECTybPy
+## }

=== modified file 'sql/filesort.cc'
--- a/sql/filesort.cc	2011-08-25 10:54:34 +0000
+++ b/sql/filesort.cc	2011-08-29 08:09:57 +0000
@@ -1040,21 +1040,10 @@ static void make_sortkey(register Sort_p
       if (addonf->null_bit && field->is_null())
       {
         nulls[addonf->null_offset]|= addonf->null_bit;
-#ifdef HAVE_purify
-	memset(to, 0, addonf->length);
-#endif
       }
       else
       {
-#ifdef HAVE_purify
-        uchar *end= field->pack(to, field->ptr);
-	uint length= (uint) ((to + addonf->length) - end);
-	DBUG_ASSERT((int) length >= 0);
-	if (length)
-	  memset(end, 0, length);
-#else
         (void) field->pack(to, field->ptr);
-#endif
       }
       to+= addonf->length;
     }

No bundle (reason: useless for push emails).