bzr push into mysql-5.1-telco-7.0 branch (jonas:4138 to 4139)

[Jonas Oreland]

 4139 Jonas Oreland	2011-01-25
      ndb - remove incorrect assertion(?)

    modified:
      storage/ndb/src/ndbapi/ClusterMgr.cpp
 4138 Magnus Blåudd	2011-01-24 [merge]
      Merge

    modified:
      mysql-test/mysql-test-run.pl
      mysql-test/suite/ndb/r/ndb_alter_table_online.result
      mysql-test/suite/ndb/r/ndb_basic.result
      mysql-test/suite/ndb/r/ndb_load.result
      mysql-test/suite/ndb/r/ndb_partition_error.result
      mysql-test/suite/ndb/r/ndb_restore.result
      mysql-test/suite/ndb/t/ndb_alter_table_online.test
      mysql-test/suite/ndb/t/ndb_basic.test
      mysql-test/suite/ndb/t/ndb_load.test
      mysql-test/suite/ndb/t/ndb_partition_error.test
      mysql-test/suite/ndb/t/ndb_restore.test
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster_binlog.cc
      sql/ha_ndbcluster_tables.h
      storage/ndb/tools/restore/Restore.cpp
=== modified file 'storage/ndb/src/ndbapi/ClusterMgr.cpp'
--- a/storage/ndb/src/ndbapi/ClusterMgr.cpp	2011-01-19 18:41:30 +0000
+++ b/storage/ndb/src/ndbapi/ClusterMgr.cpp	2011-01-25 12:22:49 +0000
@@ -296,7 +296,6 @@ ClusterMgr::startup()
   Node & cm_node = theNodes[nodeId];
   trp_node & theNode = cm_node;
   assert(theNode.defined);
-  assert(theNode.is_connected() == false);
 
   lock();
   theFacade.doConnect(nodeId);

No bundle (reason: useless for push emails).