Commit 1d548703 authored by jonas@eel.(none)'s avatar jonas@eel.(none)

ndb -

  fix ao_ignore behavior change in hugo
  (affecting testOperations & testTransactions)
parent 0657f1b5
...@@ -330,8 +330,8 @@ int HugoOperations::execute_Commit(Ndb* pNdb, ...@@ -330,8 +330,8 @@ int HugoOperations::execute_Commit(Ndb* pNdb,
int check = 0; int check = 0;
check = pTrans->execute(Commit, eao); 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); ERR(err);
NdbOperation* pOp = pTrans->getNdbErrorOperation(); NdbOperation* pOp = pTrans->getNdbErrorOperation();
if (pOp != NULL){ if (pOp != NULL){
...@@ -379,13 +379,16 @@ int HugoOperations::execute_NoCommit(Ndb* pNdb, AbortOption eao){ ...@@ -379,13 +379,16 @@ int HugoOperations::execute_NoCommit(Ndb* pNdb, AbortOption eao){
int check; int check;
check = pTrans->execute(NoCommit, eao); 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); ERR(err);
NdbOperation* pOp; const NdbOperation* pOp = pTrans->getNdbErrorOperation();
while ((pOp = pTrans->getNdbErrorOperation()) != NULL){ while (pOp != NULL)
{
const NdbError err2 = pOp->getNdbError(); const NdbError err2 = pOp->getNdbError();
if (err2.code)
ERR(err2); ERR(err2);
pOp = pTrans->getNextCompletedOperation(pOp);
} }
if (err.code == 0) if (err.code == 0)
return NDBT_FAILED; return NDBT_FAILED;
......
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