Commit 043d6d10 authored by unknown's avatar unknown

fix ndb_cache_multi2

util thread wasn't behaving correctly after 241 error due to get_table_statistics
not properly returning an error code


sql/ha_ndbcluster.cc:
  correctly call ndb_get_table_statistics in get_commitcount (don't report error)
  
  but also return an error code from get_table_statistics so that util thread
  gets error code
parent 2ebf2677
...@@ -5603,7 +5603,7 @@ uint ndb_get_commitcount(THD *thd, char *dbname, char *tabname, ...@@ -5603,7 +5603,7 @@ uint ndb_get_commitcount(THD *thd, char *dbname, char *tabname,
pthread_mutex_unlock(&share->mutex); pthread_mutex_unlock(&share->mutex);
struct Ndb_statistics stat; struct Ndb_statistics stat;
if (ndb_get_table_statistics(NULL, true, ndb, tabname, &stat)) if (ndb_get_table_statistics(NULL, false, ndb, tabname, &stat))
{ {
free_share(share); free_share(share);
DBUG_RETURN(1); DBUG_RETURN(1);
...@@ -6044,6 +6044,9 @@ retry: ...@@ -6044,6 +6044,9 @@ retry:
reterr= ndb_to_mysql_error(&tmp); reterr= ndb_to_mysql_error(&tmp);
} }
} }
else
reterr= error.code;
if (pTrans) if (pTrans)
{ {
ndb->closeTransaction(pTrans); ndb->closeTransaction(pTrans);
......
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