From: Ole John Aske
Date: October 21 2011 1:01pm
Subject: bzr push into mysql-trunk-cluster branch (ole.john.aske:3396 to 3397)
List-Archive: http://lists.mysql.com/commits/141534
Message-Id: <20111021130153.5A66C232@fimafeng09.norway.sun.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3397 Ole John Aske	2011-10-21
      Updated some result files in order to reflect that the new MRR implementation in some cases
      requires more roundtrips to send really huge set of ranges.

    modified:
      mysql-test/suite/ndb/r/ndb_update_no_read.result
      mysql-test/suite/ndb/t/ndb_bulk_delete.test
 3396 Ole John Aske	2011-10-21
      Introduced 'read before write removal' into new MRR implementation.
      
      Code is taken from old MRR (deprecated) and addapted to the new interface
      and datastructures.

    modified:
      sql/ha_ndbcluster.cc
=== modified file 'mysql-test/suite/ndb/r/ndb_update_no_read.result'
--- a/mysql-test/suite/ndb/r/ndb_update_no_read.result	2011-09-06 08:37:44 +0000
+++ b/mysql-test/suite/ndb/r/ndb_update_no_read.result	2011-10-21 13:01:20 +0000
@@ -450,7 +450,7 @@ count(*)
 1000
 affected rows: 1
 @ndb_execute_count:=VARIABLE_VALUE-@ndb_init_execute_count
-5
+9
 affected rows: 1
 set autocommit=on;
 affected rows: 0

=== modified file 'mysql-test/suite/ndb/t/ndb_bulk_delete.test'
--- a/mysql-test/suite/ndb/t/ndb_bulk_delete.test	2010-10-01 13:34:24 +0000
+++ b/mysql-test/suite/ndb/t/ndb_bulk_delete.test	2011-10-21 13:01:20 +0000
@@ -112,10 +112,10 @@ while($i)
   # Run the query
   eval delete from t3 where a in ($in);
 
-  # Check that execute count after DELETE is not greater than 3
+  # Check that execute count after DELETE is not greater than 5
   let $after= `select VARIABLE_VALUE from information_schema.session_status
                  where variable_name like 'NDB_EXECUTE_COUNT'`;
-  if (!`select $after-$before <= 3`)
+  if (!`select $after-$before <= 5`)
   {
     echo before: $before;
     echo after: $after;

No bundle (reason: useless for push emails).