From: Mattias Jonsson
Date: April 29 2011 7:57am
Subject: bzr commit into mysql-5.5 branch (mattias.jonsson:3477)
List-Archive: http://lists.mysql.com/commits/136355
Message-Id: <201104290757.p3T7vUQo029089@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

#At file:///C:/ade/mysql-bzr/topush-5.5_2/ based on revid:mattias.jonsson@stripped

 3477 Mattias Jonsson	2011-04-29 [merge]
      fix of partitioning tests that fails on windows + merge of minor cleanup

    modified:
      mysql-test/suite/parts/inc/partition_fail.inc
      sql/ha_partition.cc
=== modified file 'mysql-test/suite/parts/inc/partition_fail.inc'
--- a/mysql-test/suite/parts/inc/partition_fail.inc	2010-10-01 13:59:07 +0000
+++ b/mysql-test/suite/parts/inc/partition_fail.inc	2011-04-29 07:56:36 +0000
@@ -23,6 +23,7 @@ DROP TABLE t1;
 --eval $create_statement
 --eval $insert_statement
 --echo # State before failure
+--replace_result #p# #P# #sp# #SP#
 --list_files $DATADIR/test
 SHOW CREATE TABLE t1;
 --sorted_result
@@ -32,6 +33,7 @@ LOCK TABLE t1 WRITE;
 --eval $fail_statement
 --enable_abort_on_error
 --echo # State after failure
+--replace_result #p# #P# #sp# #SP#
 --list_files $DATADIR/test
 SHOW CREATE TABLE t1;
 --sorted_result

=== modified file 'sql/ha_partition.cc'
--- a/sql/ha_partition.cc	2011-04-27 16:42:05 +0000
+++ b/sql/ha_partition.cc	2011-04-29 07:56:36 +0000
@@ -4099,12 +4099,6 @@ void ha_partition::position(const uchar 
   if (pad_length)
     memset((ref + PARTITION_BYTES_IN_POS + file->ref_length), 0, pad_length);
 
-#ifdef SUPPORTING_PARTITION_OVER_DIFFERENT_ENGINES
-#ifdef HAVE_purify
-  bzero(ref + PARTITION_BYTES_IN_POS + ref_length,
-        max_ref_length-ref_length);
-#endif /* HAVE_purify */
-#endif
   DBUG_VOID_RETURN;
 }
 

No bundle (reason: revision is a merge (you can force generation of a bundle with env var BZR_FORCE_BUNDLE=1)).