Commit 9f542541 authored by unknown's avatar unknown
Browse files

Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb 

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
parents 9c293634 c251e8a8

sql/ha_ndbcluster.cc

+2 −0
Original line number Diff line number Diff line
@@ -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))