Commit 246a7be4 authored by unknown's avatar unknown

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 7799276f 46bb3786
......@@ -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);
}
......
......@@ -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;
/*
......
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