BUG#3963

ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  let sendTCKEY_FAILCONF reset marker
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  1) let sendTCKEY_FAILCONF reset marker
  2) Restart marker scan on NF
  3) Don't send TCKEY_FAILCONF to 0
ndb/src/mgmapi/mgmapi.cpp:
  More info from mgmapi
ndb/test/run-test/daily-basic-tests.txt:
  drop tables to fix -n MassiveRollback
ndb/test/run-test/main.cpp:
  More error messages (and retries) on error

2 files changed, 20 insertions, 5 deletions

diff --git a/ndb/test/run-test/daily-basic-tests.txt b/ndb/test/run-test/daily-basic-tests.txt
index d6f50e8da26..2f0988419f7 100644
--- a/ndb/test/run-test/daily-basic-tests.txt
+++ b/ndb/test/run-test/daily-basic-tests.txt
@@ -139,6 +139,10 @@ max-time: 500
 cmd: testBasicAsynch
 args: -n PkDeleteAsynch 
 
+max-time:
+cmd: ndb_drop_table
+args: T1 T2 T3 T4 T5 T6 T7 T8 T9 T10 T11 T12 T13 T14
+
 max-time: 500
 cmd: testBasic
 args: -n MassiveRollback T1 T6 T13 
diff --git a/ndb/test/run-test/main.cpp b/ndb/test/run-test/main.cpp
index 9db4c738186..865fe8b49a0 100644
--- a/ndb/test/run-test/main.cpp
+++ b/ndb/test/run-test/main.cpp
@@ -614,11 +614,22 @@ wait_ndb(atrt_config& config, int goal){
     /**
      * 1) retreive current state
      */
-    state = ndb_mgm_get_status(handle);
-    if(state == 0){
-      g_logger.critical("Unable to poll db state");
-      return false;
-    }
+    state = 0;
+    do {
+      state = ndb_mgm_get_status(handle);
+      if(state == 0){
+	const int err = ndb_mgm_get_latest_error(handle);
+	g_logger.error("Unable to poll db state: %d %s %s",
+		       ndb_mgm_get_latest_error(handle),
+		       ndb_mgm_get_latest_error_msg(handle),
+		       ndb_mgm_get_latest_error_desc(handle));
+	if(err == NDB_MGM_SERVER_NOT_CONNECTED && connect_ndb_mgm(config)){
+	  g_logger.error("Reconnected...");
+	  continue;
+	}
+	return false;
+      }
+    } while(state == 0);
     NdbAutoPtr<void> tmp(state);
     
     min2 = goal;