Commit 04e31c1c authored by joreland@mysql.com's avatar joreland@mysql.com

bug fixes

parent 5e5178a6
...@@ -5203,6 +5203,7 @@ void Dbtc::execTCROLLBACKREQ(Signal* signal) ...@@ -5203,6 +5203,7 @@ void Dbtc::execTCROLLBACKREQ(Signal* signal)
return; return;
}//if }//if
apiConnectptr.p->m_exec_flag = 1;
switch (apiConnectptr.p->apiConnectstate) { switch (apiConnectptr.p->apiConnectstate) {
case CS_STARTED: case CS_STARTED:
case CS_RECEIVING: case CS_RECEIVING:
......
...@@ -776,32 +776,7 @@ int runOnlyOpenScanOnce(NDBT_Context* ctx, NDBT_Step* step){ ...@@ -776,32 +776,7 @@ int runOnlyOpenScanOnce(NDBT_Context* ctx, NDBT_Step* step){
} }
int runOnlyOneOpInScanTrans(NDBT_Context* ctx, NDBT_Step* step){ int runOnlyOneOpInScanTrans(NDBT_Context* ctx, NDBT_Step* step){
const NdbDictionary::Table* pTab = ctx->getTab(); return NDBT_OK;
int records = ctx->getNumRecords();
int numFailed = 0;
ScanFunctions scanF(*pTab);
if (scanF.scanReadFunctions(GETNDB(step),
records,
6,
ScanFunctions::OnlyOneOpInScanTrans,
false) == 0){
numFailed++;
}
if (scanF.scanReadFunctions(GETNDB(step),
records,
6,
ScanFunctions::OnlyOneOpInScanTrans,
true) == 0){
numFailed++;
}
if(numFailed > 0)
return NDBT_FAILED;
else
return NDBT_OK;
} }
int runExecuteScanWithoutOpenScan(NDBT_Context* ctx, NDBT_Step* step){ int runExecuteScanWithoutOpenScan(NDBT_Context* ctx, NDBT_Step* step){
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment