ndb - autotest

  Change semantic on DumpStateOrd::CmvmiSetRestartOnErrorInsert()
    Called wo/ args it resets to value in configuration (previously it set to 1 if called wo/ args)


ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Change semantic on DumpStateOrd::CmvmiSetRestartOnErrorInsert
    Called wo/ args it resets to value in configuration (previously it set to 1 if called wo/ args)
ndb/test/ndbapi/testNodeRestart.cpp:
  Change semantic on DumpStateOrd::CmvmiSetRestartOnErrorInsert
    Called wo/ args it resets to value in configuration (previously it set to 1 if called wo/ args)
ndb/test/src/NdbBackup.cpp:
  Change semantic on DumpStateOrd::CmvmiSetRestartOnErrorInsert
    Called wo/ args it resets to value in configuration (previously it set to 1 if called wo/ args)
ndb/test/src/NdbRestarts.cpp:
  Change semantic on DumpStateOrd::CmvmiSetRestartOnErrorInsert
    Called wo/ args it resets to value in configuration (previously it set to 1 if called wo/ args)

3 files changed, 22 insertions, 10 deletions

diff --git a/ndb/test/ndbapi/testNodeRestart.cpp b/ndb/test/ndbapi/testNodeRestart.cpp
index 5a7510be9bd..365d6e3ed6e 100644
--- a/ndb/test/ndbapi/testNodeRestart.cpp
+++ b/ndb/test/ndbapi/testNodeRestart.cpp
@@ -433,6 +433,11 @@ int runBug15587(NDBT_Context* ctx, NDBT_Step* step){
   if (restarter.waitNodesNoStart(&nodeId, 1))
     return NDBT_FAILED; 
    
+  int val2[] = { DumpStateOrd::CmvmiSetRestartOnErrorInsert, 1 };
+  
+  if (restarter.dumpStateOneNode(nodeId, val2, 2))
+    return NDBT_FAILED;
+
   if (restarter.dumpStateOneNode(nodeId, dump, 2))
     return NDBT_FAILED;
 
@@ -444,6 +449,9 @@ int runBug15587(NDBT_Context* ctx, NDBT_Step* step){
   if (restarter.waitNodesNoStart(&nodeId, 1))
     return NDBT_FAILED; 
    
+  if (restarter.dumpStateOneNode(nodeId, val2, 1))
+    return NDBT_FAILED;
+  
   if (restarter.startNodes(&nodeId, 1))
     return NDBT_FAILED;
   
@@ -626,6 +634,10 @@ runBug18414(NDBT_Context* ctx, NDBT_Step* step){
 	goto err;
     }
     
+    int val2[] = { DumpStateOrd::CmvmiSetRestartOnErrorInsert, 1 };
+    if (restarter.dumpStateOneNode(node2, val2, 2))
+      goto err;
+    
     if (restarter.insertErrorInNode(node2, 5003))
       goto err;
     
diff --git a/ndb/test/src/NdbBackup.cpp b/ndb/test/src/NdbBackup.cpp
index 9f65fe6b3bc..a9c71120d80 100644
--- a/ndb/test/src/NdbBackup.cpp
+++ b/ndb/test/src/NdbBackup.cpp
@@ -292,8 +292,8 @@ NdbBackup::NF(NdbRestarter& _restarter, int *NFDuringBackup_codes, const int sz,
 	   << masterNodeId << endl;
 
 
-    int val = DumpStateOrd::CmvmiSetRestartOnErrorInsert;
-    CHECK(_restarter.dumpStateOneNode(nodeId, &val, 1) == 0,
+    int val[] = { DumpStateOrd::CmvmiSetRestartOnErrorInsert, 1 };
+    CHECK(_restarter.dumpStateOneNode(nodeId, val, 2) == 0,
 	  "failed to set RestartOnErrorInsert");
     CHECK(_restarter.insertErrorInNode(nodeId, error) == 0,
 	  "failed to set error insert");
diff --git a/ndb/test/src/NdbRestarts.cpp b/ndb/test/src/NdbRestarts.cpp
index c0f31af84ce..eea4af437c4 100644
--- a/ndb/test/src/NdbRestarts.cpp
+++ b/ndb/test/src/NdbRestarts.cpp
@@ -641,8 +641,8 @@ int restartNFDuringNR(NdbRestarter& _restarter,
     CHECK(_restarter.waitNodesNoStart(&nodeId, 1) == 0,
 	  "waitNodesNoStart failed");
     
-    int val = DumpStateOrd::CmvmiSetRestartOnErrorInsert;
-    CHECK(_restarter.dumpStateOneNode(nodeId, &val, 1) == 0,
+    int val[] = { DumpStateOrd::CmvmiSetRestartOnErrorInsert, 1 } ;
+    CHECK(_restarter.dumpStateOneNode(nodeId, val, 2) == 0,
 	  "failed to set RestartOnErrorInsert");
     
     CHECK(_restarter.insertErrorInNode(nodeId, error) == 0,
@@ -698,8 +698,8 @@ int restartNFDuringNR(NdbRestarter& _restarter,
     CHECK(_restarter.waitNodesNoStart(&nodeId, 1) == 0,
 	  "waitNodesNoStart failed");
         
-    int val = DumpStateOrd::CmvmiSetRestartOnErrorInsert;
-    CHECK(_restarter.dumpStateOneNode(crashNodeId, &val, 2) == 0,
+    int val[] = { DumpStateOrd::CmvmiSetRestartOnErrorInsert, 1 };
+    CHECK(_restarter.dumpStateOneNode(crashNodeId, val, 2) == 0,
 	  "failed to set RestartOnErrorInsert");
     
     CHECK(_restarter.insertErrorInNode(crashNodeId, error) == 0,
@@ -771,8 +771,8 @@ int restartNodeDuringLCP(NdbRestarter& _restarter,
 	   << " error code = " << error << endl;
 
     {
-      int val = DumpStateOrd::CmvmiSetRestartOnErrorInsert;
-      CHECK(_restarter.dumpStateAllNodes(&val, 1) == 0,
+      int val[] = { DumpStateOrd::CmvmiSetRestartOnErrorInsert, 1 };
+      CHECK(_restarter.dumpStateAllNodes(val, 2) == 0,
 	    "failed to set RestartOnErrorInsert");
     }
 
@@ -812,8 +812,8 @@ int restartNodeDuringLCP(NdbRestarter& _restarter,
     ndbout << _restart->m_name << " restarting non-master node = " << nodeId
 	   << " error code = " << error << endl;
 
-    int val = DumpStateOrd::CmvmiSetRestartOnErrorInsert;
-    CHECK(_restarter.dumpStateAllNodes(&val, 1) == 0,
+    int val[] = { DumpStateOrd::CmvmiSetRestartOnErrorInsert, 1 };
+    CHECK(_restarter.dumpStateAllNodes(val, 2) == 0,
 	  "failed to set RestartOnErrorInsert");
     
     CHECK(_restarter.insertErrorInNode(nodeId, error) == 0,