bzr push into mysql-5.1 branch (msvensson:3105 to 3106)

[Magnus Svensson]

 3106 Magnus Svensson	2008-11-19 [merge]
      Merge

 3105 Magnus Svensson	2008-11-19 [merge]
      Merge
modified:
  include/my_socket_win32.h
  mysql-test/suite/ndb/t/disabled.def
  sql/ha_ndbcluster.cc
  sql/ha_ndbcluster_binlog.cc
  sql/ha_ndbcluster_connection.cc
  storage/ndb/include/mgmapi/mgmapi.h
  storage/ndb/src/kernel/blocks/lgman.cpp
  storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp
  storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp
  storage/ndb/src/kernel/blocks/ndbfs/PosixAsyncFile.cpp
  storage/ndb/src/kernel/blocks/ndbfs/Win32AsyncFile.cpp
  storage/ndb/src/kernel/blocks/tsman.cpp
  storage/ndb/src/mgmapi/LocalConfig.cpp
  storage/ndb/src/mgmapi/LocalConfig.hpp
  storage/ndb/src/mgmapi/mgmapi.cpp
  storage/ndb/test/include/HugoOperations.hpp
  storage/ndb/test/include/HugoTransactions.hpp
  storage/ndb/test/src/HugoOperations.cpp
  storage/ndb/test/src/HugoTransactions.cpp
  storage/ndb/test/src/NDBT_Tables.cpp
  storage/ndb/test/tools/hugoPkRead.cpp

=== modified file 'storage/ndb/test/ndbapi/testReconnect.cpp'
--- a/storage/ndb/test/ndbapi/testReconnect.cpp	2008-11-01 08:23:05 +0000
+++ b/storage/ndb/test/ndbapi/testReconnect.cpp	2008-11-18 07:45:22 +0000
@@ -163,7 +163,7 @@ int runRestartCluster(NDBT_Context* ctx,
 }
 
 
-NDBT_TESTSUITE(testSQL);
+NDBT_TESTSUITE(testReconnect);
 TESTCASE("InsertAndRestart",
 	 "Run INSERTs while cluster restart"){
   INITIALIZER(runDropTable);
@@ -195,11 +195,11 @@ TESTCASE("AllAndRestart",
   STEP(runRestartCluster);
 }
 
-NDBT_TESTSUITE_END(testSQL);
+NDBT_TESTSUITE_END(testReconnect);
 
 int main(int argc, const char** argv){
   ndb_init();
-  NDBT_TESTSUITE_INSTANCE(testSQL);
-  return testSQL.execute(argc, argv);
+  NDBT_TESTSUITE_INSTANCE(testReconnect);
+  return testReconnect.execute(argc, argv);
 }