bzr push into mysql-5.1-telco-7.0 branch (jonas:4351 to 4352)

[jonas oreland]

 4352 jonas oreland	2011-05-03
      ndb - fix upgrade with deferred constraints

    modified:
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
 4351 jonas oreland	2011-05-03
      ndb - increase timeout for DeferredMixedLoadError

    modified:
      storage/ndb/test/run-test/daily-basic-tests.txt
=== modified file 'storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2011-04-28 07:47:53 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2011-05-03 13:48:54 +0000
@@ -8407,7 +8407,7 @@ void Dbtc::execNODE_FAILREP(Signal* sign
     Uint32 ok = 1;
     for(Uint32 n = c_alive_nodes.find_first();
         n != c_alive_nodes.NotFound;
-        n = c_alive_nodes.find_next(n))
+        n = c_alive_nodes.find_next(n+1))
     {
       if (!ndbd_deferred_unique_constraints(getNodeInfo(n).m_version))
       {

No bundle (reason: useless for push emails).