mirror of
https://github.com/MariaDB/server.git
synced 2025-01-20 14:02:32 +01:00
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into perch.ndb.mysql.com:/home/jonas/src/51-work sql/ha_ndbcluster.cc: Auto merged
This commit is contained in:
commit
4cf8b57972
1 changed files with 2 additions and 0 deletions
|
@ -47,6 +47,7 @@
|
|||
// options from from mysqld.cc
|
||||
extern my_bool opt_ndb_optimized_node_selection;
|
||||
extern const char *opt_ndbcluster_connectstring;
|
||||
extern ulong opt_ndb_cache_check_time;
|
||||
|
||||
const char *ndb_distribution_names[]= {"KEYHASH", "LINHASH", NullS};
|
||||
TYPELIB ndb_distribution_typelib= { array_elements(ndb_distribution_names)-1,
|
||||
|
@ -6468,6 +6469,7 @@ static int ndbcluster_init()
|
|||
pthread_cond_init(&COND_ndb_util_thread, NULL);
|
||||
|
||||
|
||||
ndb_cache_check_time = opt_ndb_cache_check_time;
|
||||
// Create utility thread
|
||||
pthread_t tmp;
|
||||
if (pthread_create(&tmp, &connection_attrib, ndb_util_thread_func, 0))
|
||||
|
|
Loading…
Reference in a new issue