ha_ndbcluster.cc:

    Bug #25668    ndb: mysqld may core if cluster disconnected
    -- pTrans may be NULL, remove not needed usage of handler::ndb_err
parent 88bc918b
...@@ -6109,32 +6109,25 @@ ndb_get_table_statistics(ha_ndbcluster* file, bool report_error, Ndb* ndb, ...@@ -6109,32 +6109,25 @@ ndb_get_table_statistics(ha_ndbcluster* file, bool report_error, Ndb* ndb,
DBUG_RETURN(0); DBUG_RETURN(0);
retry: retry:
if(report_error)
{ {
if (file) ndb->closeTransaction(pTrans);
pTrans= NULL;
}
if (error.status == NdbError::TemporaryError && retries--)
{ {
reterr= file->ndb_err(pTrans); my_sleep(retry_sleep);
continue;
} }
else if(report_error)
{ {
const NdbError& tmp= error; const NdbError& tmp= error;
ERR_PRINT(tmp); ERR_PRINT(tmp);
reterr= ndb_to_mysql_error(&tmp); reterr= ndb_to_mysql_error(&tmp);
} }
}
else else
reterr= error.code; reterr= error.code;
if (pTrans)
{
ndb->closeTransaction(pTrans);
pTrans= NULL;
}
if (error.status == NdbError::TemporaryError && retries--)
{
my_sleep(retry_sleep);
continue;
}
break; break;
} while(1); } while(1);
DBUG_PRINT("exit", ("failed, reterr: %u, NdbError %u(%s)", reterr, DBUG_PRINT("exit", ("failed, reterr: %u, NdbError %u(%s)", reterr,
......
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