bzr push into mysql-5.5-cluster-7.2 branch (ole.john.aske:4114 to 4115)

[Ole John Aske]

 4115 Ole John Aske	2012-11-23
      Fix failing ndb_bushy_joins.test under Valgrind
      
      Extends the TimeBetweenEpoch (x 10) to avoid failure due to
      slow valgrind tests exceeding MaxBufferedEpochs

    modified:
      mysql-test/suite/ndb/t/ndb_bushy_joins.cnf
 4114 Ole John Aske	2012-11-23
      Revert of previous unintended pushes

    modified:
      mysql-test/suite/ndb/t/ndb_bushy_joins.cnf
      storage/ndb/include/transporter/TransporterRegistry.hpp
      storage/ndb/src/common/transporter/TransporterRegistry.cpp
      storage/ndb/src/kernel/vm/mt.cpp
=== modified file 'mysql-test/suite/ndb/t/ndb_bushy_joins.cnf'
--- a/mysql-test/suite/ndb/t/ndb_bushy_joins.cnf	2012-11-23 11:46:55 +0000
+++ b/mysql-test/suite/ndb/t/ndb_bushy_joins.cnf	2012-11-23 11:57:28 +0000
@@ -15,6 +15,7 @@ ThreadConfig=ldm={count=4}
 MaxNoOfConcurrentOperations=250000
 LongMessageBuffer=64M
 TransactionDeadlockDetectionTimeout=30000
+TimeBetweenEpochs=1000
 
 [ENV]
 # Need to always use ndbmtd when we want lots of partitions

No bundle (reason: useless for push emails).