Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-cga

into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb

Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-cga
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
54bd795f · tomas@poseidon.mysql.com · 9364181b · bbe3008a · 54bd795f · 54bd795f
Commit 54bd795f authored Feb 06, 2007 by tomas@poseidon.mysql.com
Showing with 245 additions and 29 deletions

sql/ha_ndbcluster.cc sql/ha_ndbcluster.cc +144 -19

sql/ha_ndbcluster_binlog.cc sql/ha_ndbcluster_binlog.cc +100 -9

storage/ndb/src/ndbapi/TransporterFacade.cpp storage/ndb/src/ndbapi/TransporterFacade.cpp +1 -1

No files found.
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
--- a/sql/ha_ndbcluster_binlog.cc
+++ b/sql/ha_ndbcluster_binlog.cc
--- a/storage/ndb/src/ndbapi/TransporterFacade.cpp
+++ b/storage/ndb/src/ndbapi/TransporterFacade.cpp
@@ -1403,7 +1403,7 @@ int PollGuard::wait_for_input_in_loop(int wait_time, bool forceSend)
    }
    if (wait_time == -1)
    {
-#ifdef VM_TRACE
+#ifdef NOT_USED
      ndbout << "Waited WAITFOR_RESPONSE_TIMEOUT, continuing wait" << endl;
 #endif
      continue;