Commit 15eebdc0 authored by unknown's avatar unknown
Browse files

ha_ndbcluster.cc: 

  Bug #25668    - corrected patch after test failures


sql/ha_ndbcluster.cc:
  Bug #25668    - corrected patch after test failures
parent 1c24fc31

sql/ha_ndbcluster.cc

+16 −9
Original line number Diff line number Diff line
@@ -6109,25 +6109,32 @@ ndb_get_table_statistics(ha_ndbcluster* file, bool report_error, Ndb* ndb, 


    DBUG_RETURN(0);

retry:



    if(report_error)

    {

      ndb->closeTransaction(pTrans);

      pTrans= NULL;

    }

    if (error.status == NdbError::TemporaryError && retries--)

      if (file && pTrans)

      {

      my_sleep(retry_sleep);

      continue;

        reterr= file->ndb_err(pTrans);

      }

    if(report_error)

      else

      {

        const NdbError& tmp= error;

        ERR_PRINT(tmp);

        reterr= ndb_to_mysql_error(&tmp);

      }

    }

    else

      reterr= error.code;



    if (pTrans)

    {

      ndb->closeTransaction(pTrans);

      pTrans= NULL;

    }

    if (error.status == NdbError::TemporaryError && retries--)

    {

      my_sleep(retry_sleep);

      continue;

    }

    break;

  } while(1);

  DBUG_PRINT("exit", ("failed, reterr: %u, NdbError %u(%s)", reterr,