mirror of
https://github.com/MariaDB/server.git
synced 2025-02-01 03:21:53 +01:00
ndb -
fix ao_ignore behavior change in hugo (affecting testOperations & testTransactions) storage/ndb/test/src/HugoOperations.cpp: fix ao_ignore behavior change in hugo
This commit is contained in:
parent
72d0ba1b12
commit
9197d6b8d9
1 changed files with 10 additions and 7 deletions
|
@ -330,8 +330,8 @@ int HugoOperations::execute_Commit(Ndb* pNdb,
|
|||
int check = 0;
|
||||
check = pTrans->execute(Commit, eao);
|
||||
|
||||
if( check == -1 ) {
|
||||
const NdbError err = pTrans->getNdbError();
|
||||
const NdbError err = pTrans->getNdbError();
|
||||
if( check == -1 || err.code) {
|
||||
ERR(err);
|
||||
NdbOperation* pOp = pTrans->getNdbErrorOperation();
|
||||
if (pOp != NULL){
|
||||
|
@ -379,13 +379,16 @@ int HugoOperations::execute_NoCommit(Ndb* pNdb, AbortOption eao){
|
|||
int check;
|
||||
check = pTrans->execute(NoCommit, eao);
|
||||
|
||||
if( check == -1 ) {
|
||||
const NdbError err = pTrans->getNdbError();
|
||||
const NdbError err = pTrans->getNdbError();
|
||||
if( check == -1 || err.code) {
|
||||
ERR(err);
|
||||
NdbOperation* pOp;
|
||||
while ((pOp = pTrans->getNdbErrorOperation()) != NULL){
|
||||
const NdbOperation* pOp = pTrans->getNdbErrorOperation();
|
||||
while (pOp != NULL)
|
||||
{
|
||||
const NdbError err2 = pOp->getNdbError();
|
||||
ERR(err2);
|
||||
if (err2.code)
|
||||
ERR(err2);
|
||||
pOp = pTrans->getNextCompletedOperation(pOp);
|
||||
}
|
||||
if (err.code == 0)
|
||||
return NDBT_FAILED;
|
||||
|
|
Loading…
Add table
Reference in a new issue