Commit 46ca7d1f authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 

into neptunus.homeip.net:/home/msvensson/mysql/mysql-5.0


sql/ha_ndbcluster.cc:
  Auto merged
parents 8602ef93 61da5b4d

sql/ha_ndbcluster.cc

+1 −0
Original line number Diff line number Diff line
@@ -5759,6 +5759,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);

}

sql/ha_ndbcluster.h

+1 −1
Original line number Diff line number Diff line
@@ -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;



/*