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

into neptunus.(none):/home/msvensson/mysql/mysql-5.0


sql/mysqld.cc:
  Auto merged

2 files changed, 5 insertions, 3 deletions

diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
index 12e2e3672cc..884830c51ed 100644
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -5783,8 +5783,11 @@ extern "C" pthread_handler_decl(ndb_util_thread_func,
       continue;
     }
 
+    /* Round tim e from millisceonds to seconds */
+    uint wait_secs= ((ndb_cache_check_time+999)/1000);
+    DBUG_PRINT("ndb_util_thread", ("wait_secs: %d", wait_secs));
     /* Set new time to wake up */
-    set_timespec(abstime, ndb_cache_check_time);
+    set_timespec(abstime, wait_secs);
 
     /* Lock mutex and fill list with pointers to all open tables */
     NDB_SHARE *share;
@@ -5793,7 +5796,6 @@ extern "C" pthread_handler_decl(ndb_util_thread_func,
     {
       share= (NDB_SHARE *)hash_element(&ndbcluster_open_tables, i);
       share->use_count++; /* Make sure the table can't be closed */
-
       DBUG_PRINT("ndb_util_thread",
                  ("Found open table[%d]: %s, use_count: %d",
                   i, share->table_name, share->use_count));
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 9013a7f5c3d..c230f976adc 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -4668,7 +4668,7 @@ Disable with --skip-ndbcluster (will save memory).",
    (gptr*) &opt_ndb_optimized_node_selection,
    0, GET_BOOL, OPT_ARG, 1, 0, 0, 0, 0, 0},
   { "ndb-cache-check-time", OPT_NDB_CACHE_CHECK_TIME,
-    "A dedicated thread is created to update cached commit count value at the given interval.",
+    "A dedicated thread is created to, at the given millisecons interval, invalidate the query cache if another MySQL server in the cluster has changed the data in the database.",
     (gptr*) &opt_ndb_cache_check_time, (gptr*) &opt_ndb_cache_check_time, 0, GET_ULONG, REQUIRED_ARG,
     0, 0, LONG_TIMEOUT, 0, 1, 0},
 #endif