bk commit into 5.0 tree (jonas:1.2241) BUG#20708

[jonas]

Below is the list of changes that have just been committed into a local
5.0 repository of jonas. When jonas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-08-15 14:22:47+02:00, jonas@stripped +1 -0
  ndb - bug#20708
    init ndb_cache_check_time and honor value in my.cnf

  sql/ha_ndbcluster.cc@stripped, 2006-08-15 14:22:46+02:00, jonas@stripped +2 -0
    init ndb_cache_check_time and honor value in my.cnf

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/50-work

--- 1.273/sql/ha_ndbcluster.cc	2006-08-15 14:22:51 +02:00
+++ 1.274/sql/ha_ndbcluster.cc	2006-08-15 14:22:51 +02:00
@@ -35,6 +35,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;
 
 // Default value for parallelism
 static const int parallelism= 0;
@@ -5210,6 +5211,7 @@
   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))