bzr push into mysql-5.5-cluster branch (jonas.oreland:3438 to 3439)

[Jonas Oreland]

 3439 Jonas Oreland	2011-08-25
      ndb 55 - randomly update scan_count...needs to be fixed in 70

    modified:
      mysql-test/suite/ndb/r/ndb_join_pushdown.result
 3438 Jonas Oreland	2011-08-25 [merge]
      ndb - merge 71 to 55

    modified:
      sql/ha_ndbcluster.cc
      storage/ndb/include/ndbapi/NdbReceiver.hpp
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
      storage/ndb/src/kernel/blocks/dbspj/Dbspj.hpp
      storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp
      storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
      storage/ndb/src/ndbapi/NdbQueryOperation.cpp
      storage/ndb/src/ndbapi/NdbQueryOperation.hpp
      storage/ndb/src/ndbapi/NdbQueryOperationImpl.hpp
      storage/ndb/src/ndbapi/NdbReceiver.cpp
=== modified file 'mysql-test/suite/ndb/r/ndb_join_pushdown.result'
--- a/mysql-test/suite/ndb/r/ndb_join_pushdown.result	2011-06-30 12:19:14 +0000
+++ b/mysql-test/suite/ndb/r/ndb_join_pushdown.result	2011-08-25 07:17:03 +0000
@@ -5211,7 +5211,7 @@ drop table spj_save_counts;
 drop table spj_counts_at_startup;
 drop table spj_counts_at_end;
 scan_count
-2511
+2520
 pruned_scan_count
 8
 sorted_scan_count

No bundle (reason: useless for push emails).