bzr push into mysql-trunk-cluster branch (ole.john.aske:3397 to 3398)

[Ole John Aske]

 3398 Ole John Aske	2011-10-21
      Reverted part of previous fix: Increased execute count should not
      be expected after all when 'Read Before Write Removal' now has 
      been implemented.

    modified:
      mysql-test/suite/ndb/t/ndb_bulk_delete.test
 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
=== modified file 'mysql-test/suite/ndb/t/ndb_bulk_delete.test'
--- a/mysql-test/suite/ndb/t/ndb_bulk_delete.test	2011-10-21 13:01:20 +0000
+++ b/mysql-test/suite/ndb/t/ndb_bulk_delete.test	2011-10-21 14:10:22 +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 5
+  # Check that execute count after DELETE is not greater than 3
   let $after= `select VARIABLE_VALUE from information_schema.session_status
                  where variable_name like 'NDB_EXECUTE_COUNT'`;
-  if (!`select $after-$before <= 5`)
+  if (!`select $after-$before <= 3`)
   {
     echo before: $before;
     echo after: $after;

No bundle (reason: useless for push emails).