mirror of
https://github.com/MariaDB/server.git
synced 2025-07-27 18:02:13 +03:00
Merge 4.1 with jonas irix clone
BitKeeper/etc/logging_ok: auto-union ndb/include/kernel/NodeState.hpp: Auto merged ndb/include/ndbapi/NdbDictionary.hpp: Auto merged ndb/include/util/Bitmask.hpp: Auto merged ndb/src/common/debugger/EventLogger.cpp: Auto merged ndb/src/common/transporter/TransporterRegistry.cpp: Auto merged ndb/src/common/util/SocketServer.cpp: Auto merged ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp: Auto merged ndb/src/kernel/blocks/dbacc/DbaccMain.cpp: Auto merged ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Auto merged ndb/src/kernel/blocks/dbdih/DbdihInit.cpp: Auto merged ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Auto merged ndb/src/kernel/main.cpp: Auto merged ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Auto merged ndb/src/kernel/blocks/qmgr/QmgrMain.cpp: Auto merged ndb/src/kernel/error/ErrorReporter.hpp: Auto merged ndb/src/mgmapi/mgmapi.cpp: Auto merged ndb/src/mgmclient/CpcClient.cpp: Auto merged ndb/src/mgmsrv/Services.cpp: Auto merged ndb/src/ndbapi/Ndb.cpp: Auto merged ndb/src/ndbapi/NdbDictionaryImpl.cpp: Auto merged ndb/src/ndbapi/NdbEventOperationImpl.cpp: Auto merged ndb/src/ndbapi/Ndbinit.cpp: Auto merged ndb/test/include/NDBT_Table.hpp: Auto merged ndb/test/include/NDBT_Test.hpp: Auto merged ndb/test/run-test/main.cpp: Auto merged ndb/test/src/HugoOperations.cpp: Auto merged ndb/test/src/HugoTransactions.cpp: Auto merged ndb/test/src/NDBT_Tables.cpp: Auto merged ndb/test/src/NDBT_Test.cpp: Auto merged ndb/test/src/NdbRestarter.cpp: Auto merged ndb/tools/waiter.cpp: Auto merged sql/ha_ndbcluster.cc: Auto merged
This commit is contained in:
@ -112,6 +112,7 @@ public:
|
||||
NDBT_Step(NDBT_TestCase* ptest,
|
||||
const char* pname,
|
||||
NDBT_TESTFUNC* pfunc);
|
||||
virtual ~NDBT_Step() {}
|
||||
int execute(NDBT_Context*);
|
||||
virtual int setUp() = 0;
|
||||
virtual void tearDown() = 0;
|
||||
@ -134,8 +135,9 @@ public:
|
||||
NDBT_NdbApiStep(NDBT_TestCase* ptest,
|
||||
const char* pname,
|
||||
NDBT_TESTFUNC* pfunc);
|
||||
int setUp();
|
||||
void tearDown();
|
||||
virtual ~NDBT_NdbApiStep() {}
|
||||
virtual int setUp();
|
||||
virtual void tearDown();
|
||||
|
||||
Ndb* getNdb();
|
||||
protected:
|
||||
@ -147,6 +149,7 @@ public:
|
||||
NDBT_ParallelStep(NDBT_TestCase* ptest,
|
||||
const char* pname,
|
||||
NDBT_TESTFUNC* pfunc);
|
||||
virtual ~NDBT_ParallelStep() {}
|
||||
};
|
||||
|
||||
class NDBT_Verifier : public NDBT_NdbApiStep {
|
||||
@ -154,6 +157,7 @@ public:
|
||||
NDBT_Verifier(NDBT_TestCase* ptest,
|
||||
const char* name,
|
||||
NDBT_TESTFUNC* func);
|
||||
virtual ~NDBT_Verifier() {}
|
||||
};
|
||||
|
||||
class NDBT_Initializer : public NDBT_NdbApiStep {
|
||||
@ -161,6 +165,7 @@ public:
|
||||
NDBT_Initializer(NDBT_TestCase* ptest,
|
||||
const char* name,
|
||||
NDBT_TESTFUNC* func);
|
||||
virtual ~NDBT_Initializer() {}
|
||||
};
|
||||
|
||||
class NDBT_Finalizer : public NDBT_NdbApiStep {
|
||||
@ -168,6 +173,7 @@ public:
|
||||
NDBT_Finalizer(NDBT_TestCase* ptest,
|
||||
const char* name,
|
||||
NDBT_TESTFUNC* func);
|
||||
virtual ~NDBT_Finalizer() {}
|
||||
};
|
||||
|
||||
|
||||
@ -176,7 +182,8 @@ public:
|
||||
NDBT_TestCase(NDBT_TestSuite* psuite,
|
||||
const char* name,
|
||||
const char* comment);
|
||||
virtual ~NDBT_TestCase(){};
|
||||
virtual ~NDBT_TestCase(){}
|
||||
|
||||
// This is the default executor of a test case
|
||||
// When a test case is executed it will need to be suplied with a number of
|
||||
// different parameters and settings, these are passed to the test in the
|
||||
|
Reference in New Issue
Block a user