database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

ndb - bug#24717

Browse Source 
fixes to testprogram to test new impl. in 5.1
This commit is contained in:
jonas@perch.ndb.mysql.com
2006-12-01 11:08:53 +01:00
parent 75467cc9f1
commit 13c44a9197
3 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp
View File

@ -141,7 +141,7 @@ public:
TuxSetLogFlags = 12002, TuxSetLogFlags = 12002,
TuxMetaDataJunk = 12009, TuxMetaDataJunk = 12009,
DumpTsman = 9002, DumpTsman = 9800,
DumpLgman = 10000, DumpLgman = 10000,
DumpPgman = 11000 DumpPgman = 11000
}; };

14
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
View File

@ -578,6 +578,7 @@ void Cmvmi::execCONNECT_REP(Signal *signal){
/** /**
* Dont allow api nodes to connect * Dont allow api nodes to connect
*/ */
ndbout_c("%d %d %d", hostId, type, globalData.theStartLevel);
abort(); abort();
globalTransporterRegistry.do_disconnect(hostId); globalTransporterRegistry.do_disconnect(hostId);
} }
@ -1208,13 +1209,16 @@ Cmvmi::execDUMP_STATE_ORD(Signal* signal)
if (arg == 9001) if (arg == 9001)
{ {
CLEAR_ERROR_INSERT_VALUE; CLEAR_ERROR_INSERT_VALUE;
for (Uint32 i = 0; i<MAX_NODES; i++) if (signal->getLength() == 1 || signal->theData[1])
{ {
if (c_error_9000_nodes_mask.get(i)) for (Uint32 i = 0; i<MAX_NODES; i++)
{ {
signal->theData[0] = 0; if (c_error_9000_nodes_mask.get(i))
signal->theData[1] = i; {
EXECUTE_DIRECT(CMVMI, GSN_OPEN_COMREQ, signal, 2); signal->theData[0] = 0;
signal->theData[1] = i;
EXECUTE_DIRECT(CMVMI, GSN_OPEN_COMREQ, signal, 2);
}
} }
} }
c_error_9000_nodes_mask.clear(); c_error_9000_nodes_mask.clear();

4
storage/ndb/test/ndbapi/testNodeRestart.cpp
View File

@ -1005,7 +1005,7 @@ int runBug24717(NDBT_Context* ctx, NDBT_Step* step){
HugoTransactions hugoTrans(*ctx->getTab()); HugoTransactions hugoTrans(*ctx->getTab());
int dump[] = { 9002, 0 } ; int dump[] = { 9000, 0 } ;
Uint32 ownNode = refToNode(pNdb->getReference()); Uint32 ownNode = refToNode(pNdb->getReference());
dump[1] = ownNode; dump[1] = ownNode;
@ -1025,6 +1025,8 @@ int runBug24717(NDBT_Context* ctx, NDBT_Step* step){
hugoTrans.pkReadRecords(pNdb, 100, 1, NdbOperation::LM_CommittedRead); hugoTrans.pkReadRecords(pNdb, 100, 1, NdbOperation::LM_CommittedRead);
} }
int reset[2] = { 9001, 0 };
restarter.dumpStateOneNode(nodeId, reset, 2);
restarter.waitClusterStarted(); restarter.waitClusterStarted();
} }