mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Merge
configure.in: Auto merged ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Auto merged ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Auto merged ndb/test/ndbapi/testScan.cpp: Auto merged ndb/test/src/NDBT_Test.cpp: Auto merged ndb/test/run-test/daily-basic-tests.txt: SCCS merged
This commit is contained in:
@ -35,7 +35,8 @@ getTable(Ndb* pNdb, int i){
|
||||
|
||||
int runLoadTable(NDBT_Context* ctx, NDBT_Step* step){
|
||||
|
||||
int records = ctx->getNumRecords();
|
||||
int records = ctx->getProperty("Rows", ctx->getNumRecords());
|
||||
|
||||
HugoTransactions hugoTrans(*ctx->getTab());
|
||||
if (hugoTrans.loadTable(GETNDB(step), records) != 0){
|
||||
return NDBT_FAILED;
|
||||
@ -264,7 +265,7 @@ int runVerifyTable(NDBT_Context* ctx, NDBT_Step* step){
|
||||
|
||||
int runScanRead(NDBT_Context* ctx, NDBT_Step* step){
|
||||
int loops = ctx->getNumLoops();
|
||||
int records = ctx->getNumRecords();
|
||||
int records = ctx->getProperty("Rows", ctx->getNumRecords());
|
||||
int parallelism = ctx->getProperty("Parallelism", 240);
|
||||
int abort = ctx->getProperty("AbortProb", 5);
|
||||
|
||||
@ -375,7 +376,20 @@ int runScanReadError(NDBT_Context* ctx, NDBT_Step* step){
|
||||
restarter.insertErrorInAllNodes(0);
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
runInsertError(NDBT_Context* ctx, NDBT_Step* step){
|
||||
int error = ctx->getProperty("ErrorCode");
|
||||
NdbRestarter restarter;
|
||||
|
||||
ctx->setProperty("ErrorCode", (Uint32)0);
|
||||
if (restarter.insertErrorInAllNodes(error) != 0){
|
||||
ndbout << "Could not insert error in all nodes "<<endl;
|
||||
return NDBT_FAILED;
|
||||
}
|
||||
return NDBT_OK;
|
||||
}
|
||||
|
||||
int runScanReadErrorOneNode(NDBT_Context* ctx, NDBT_Step* step){
|
||||
int result = NDBT_OK;
|
||||
int loops = ctx->getNumLoops();
|
||||
@ -1258,6 +1272,16 @@ TESTCASE("ScanRead100",
|
||||
STEPS(runScanRead, 100);
|
||||
FINALIZER(runClearTable);
|
||||
}
|
||||
TESTCASE("Scan-bug8262",
|
||||
""){
|
||||
TC_PROPERTY("Rows", 1);
|
||||
TC_PROPERTY("ErrorCode", 8035);
|
||||
INITIALIZER(runLoadTable);
|
||||
INITIALIZER(runInsertError); // Will reset error code
|
||||
STEPS(runScanRead, 25);
|
||||
FINALIZER(runInsertError);
|
||||
FINALIZER(runClearTable);
|
||||
}
|
||||
TESTCASE("ScanRead40RandomTable",
|
||||
"Verify scan requirement: Scan with 40 simultaneous threads. "\
|
||||
"Use random table for the scan"){
|
||||
|
Reference in New Issue
Block a user