diff options
| author | unknown <jonas@perch.ndb.mysql.com> | 2006-03-27 10:26:37 +0200 |
|---|---|---|
| committer | unknown <jonas@perch.ndb.mysql.com> | 2006-03-27 10:26:37 +0200 |
| commit | b4af134a528db18539bd84c50b076ac3572ae1e2 (patch) | |
| tree | cc1be8c247f892345afff69735c4594b0f38ef80 /storage/ndb/test/src/NdbBackup.cpp | |
| parent | f9140bdf6315e12beac6024a20440a88738261b7 (diff) | |
| parent | f97e32b0b27b5f93f287b84ea1595671d539291f (diff) | |
| download | mariadb-git-b4af134a528db18539bd84c50b076ac3572ae1e2.tar.gz | |
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
storage/ndb/test/ndbapi/testNodeRestart.cpp:
Auto merged
storage/ndb/test/src/NdbBackup.cpp:
Auto merged
storage/ndb/test/src/NdbRestarts.cpp:
Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
merge
Diffstat (limited to 'storage/ndb/test/src/NdbBackup.cpp')
| -rw-r--r-- | storage/ndb/test/src/NdbBackup.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/ndb/test/src/NdbBackup.cpp b/storage/ndb/test/src/NdbBackup.cpp index 588f785c5a3..42ebf31fc47 100644 --- a/storage/ndb/test/src/NdbBackup.cpp +++ b/storage/ndb/test/src/NdbBackup.cpp @@ -291,8 +291,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"); |