bzr push into mysql-5.1-telco-7.0 branch (jonas.oreland:4506 to 4507)

[jonas oreland]

 4507 jonas oreland	2011-09-07
      ndb - update result file :-(

    modified:
      mysql-test/suite/ndb/r/ndb_basic.result
 4506 John David Duncan	2011-09-07
      Configurable timer in the NDB API send thread (from 1 ms to 10 ms)

    modified:
      storage/ndb/include/ndbapi/ndb_cluster_connection.hpp
      storage/ndb/src/ndbapi/TransporterFacade.cpp
      storage/ndb/src/ndbapi/TransporterFacade.hpp
      storage/ndb/src/ndbapi/ndb_cluster_connection.cpp
=== modified file 'mysql-test/suite/ndb/r/ndb_basic.result'
--- a/mysql-test/suite/ndb/r/ndb_basic.result	2011-09-02 05:20:56 +0000
+++ b/mysql-test/suite/ndb/r/ndb_basic.result	2011-09-07 19:45:53 +0000
@@ -2,6 +2,15 @@ DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t
 drop database if exists mysqltest;
 SHOW GLOBAL STATUS LIKE 'ndb\_%';
 Variable_name	Value
+Ndb_api_adaptive_send_deferred_count	#
+Ndb_api_adaptive_send_deferred_count_session	#
+Ndb_api_adaptive_send_deferred_count_slave	#
+Ndb_api_adaptive_send_forced_count	#
+Ndb_api_adaptive_send_forced_count_session	#
+Ndb_api_adaptive_send_forced_count_slave	#
+Ndb_api_adaptive_send_unforced_count	#
+Ndb_api_adaptive_send_unforced_count_session	#
+Ndb_api_adaptive_send_unforced_count_slave	#
 Ndb_api_bytes_received_count	#
 Ndb_api_bytes_received_count_session	#
 Ndb_api_bytes_received_count_slave	#

No bundle (reason: useless for push emails).