diff options
| author | jonas@perch.ndb.mysql.com <> | 2006-03-27 10:18:48 +0200 |
|---|---|---|
| committer | jonas@perch.ndb.mysql.com <> | 2006-03-27 10:18:48 +0200 |
| commit | a3b51fda9fde905596f679248e202dd785116736 (patch) | |
| tree | f3e3a76e841a3288c7fc993763677544b30605f9 /ndb/test/src | |
| parent | 82925040bcf404d9ac11839619719de32139c82b (diff) | |
| download | mariadb-git-a3b51fda9fde905596f679248e202dd785116736.tar.gz | |
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)
Diffstat (limited to 'ndb/test/src')
| -rw-r--r-- | ndb/test/src/NdbBackup.cpp | 4 | ||||
| -rw-r--r-- | ndb/test/src/NdbRestarts.cpp | 16 |
2 files changed, 10 insertions, 10 deletions
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, |