diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
index 5c44479aa12..07d5388f9b5 100644
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -5711,6 +5711,7 @@ extern "C" pthread_handler_decl(ndb_util_thread_func,
   delete thd;
   DBUG_PRINT("exit", ("ndb_util_thread"));
   my_thread_end();
+  pthread_exit(0);
   DBUG_RETURN(NULL);
 }
 
diff --git a/sql/ha_ndbcluster.h b/sql/ha_ndbcluster.h
index fb624353491..b27908c20ea 100644
--- a/sql/ha_ndbcluster.h
+++ b/sql/ha_ndbcluster.h
@@ -60,7 +60,7 @@ typedef struct st_ndbcluster_share {
   pthread_mutex_t mutex;
   char *table_name;
   uint table_name_length,use_count;
-  uint commit_count;
+  ulonglong commit_count;
 } NDB_SHARE;
 
 /*