mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 19:11:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca

Browse source 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
This commit is contained in:
unknown 2007-03-27 16:16:02 +02:00
commit 070b77d441
2 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
View file

@ -2123,16 +2123,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++)
{

4
storage/ndb/test/src/NdbRestarts.cpp
View file

@ -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);