Commit 043d6d10 authored by unknown's avatar unknown
Browse files

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

sql/ha_ndbcluster.cc

+4 −1
Original line number Diff line number Diff line
@@ -5603,7 +5603,7 @@ uint ndb_get_commitcount(THD *thd, char *dbname, char *tabname, 
  pthread_mutex_unlock(&share->mutex);



  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);

    DBUG_RETURN(1);
@@ -6044,6 +6044,9 @@ ndb_get_table_statistics(ha_ndbcluster* file, bool report_error, Ndb* ndb, 
        reterr= ndb_to_mysql_error(&tmp);

      }

    }

    else

      reterr= error.code;



    if (pTrans)

    {

      ndb->closeTransaction(pTrans);