From 59ce334d4526e86b6e9210af1fb6723c54c3d0ba Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 27 Mar 2007 16:15:22 +0200 Subject: [PATCH] ndb - reformat code a bit to be more compiler friendly storage/ndb/test/src/NdbRestarts.cpp: more verbosity --- storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp | 13 +++++-------- storage/ndb/test/src/NdbRestarts.cpp | 4 ++-- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp b/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp index e330afcef36..76ff0dcc41b 100644 --- a/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp +++ b/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp @@ -2057,16 +2057,13 @@ void Dbdih::execINCL_NODECONF(Signal* signal) TstartNode_or_blockref = signal->theData[0]; TsendNodeId = signal->theData[1]; - static Uint32 blocklist[] = { - clocallqhblockref, - clocaltcblockref, - cdictblockref, - 0, - 0, - 0 - }; + Uint32 blocklist[6]; + blocklist[0] = clocallqhblockref; + blocklist[1] = clocaltcblockref; + blocklist[2] = cdictblockref; blocklist[3] = numberToRef(BACKUP, getOwnNodeId()); blocklist[4] = numberToRef(SUMA, getOwnNodeId()); + blocklist[5] = 0; for (Uint32 i = 0; blocklist[i] != 0; i++) { diff --git a/storage/ndb/test/src/NdbRestarts.cpp b/storage/ndb/test/src/NdbRestarts.cpp index 013c7a97d1f..6ec520887b5 100644 --- a/storage/ndb/test/src/NdbRestarts.cpp +++ b/storage/ndb/test/src/NdbRestarts.cpp @@ -630,8 +630,8 @@ int restartNFDuringNR(NdbRestarter& _restarter, int nodeId = _restarter.getDbNodeId(randomId); int error = NFDuringNR_codes[i]; - g_info << _restart->m_name << ": node = " << nodeId - << " error code = " << error << endl; + g_err << _restart->m_name << ": node = " << nodeId + << " error code = " << error << endl; CHECK(_restarter.restartOneDbNode(nodeId, false, true, true) == 0, "Could not restart node "<< nodeId);