Commit ecde7832 authored by unknown's avatar unknown

Fix so that ndb-cache-check-time is measured in milliseconds


sql/ha_ndbcluster.cc:
  Use ndb-cache-check-time as millsecond interval
sql/mysqld.cc:
  Change name of variable ndb-cache-check_time to use - instead of _
parent 493911bd
...@@ -5746,7 +5746,7 @@ extern "C" pthread_handler_decl(ndb_util_thread_func, ...@@ -5746,7 +5746,7 @@ extern "C" pthread_handler_decl(ndb_util_thread_func,
} }
List<NDB_SHARE> util_open_tables; List<NDB_SHARE> util_open_tables;
set_timespec(abstime, ndb_cache_check_time); set_timespec(abstime, 0);
for (;;) for (;;)
{ {
...@@ -5764,12 +5764,21 @@ extern "C" pthread_handler_decl(ndb_util_thread_func, ...@@ -5764,12 +5764,21 @@ extern "C" pthread_handler_decl(ndb_util_thread_func,
if (ndb_cache_check_time == 0) if (ndb_cache_check_time == 0)
{ {
/* Wake up in 10 seconds to check if value has changed */
set_timespec(abstime, 10); set_timespec(abstime, 10);
continue; continue;
} }
/* Set new time to wake up */ /* Set new time to wake up */
set_timespec(abstime, ndb_cache_check_time); struct timeval tv;
gettimeofday(&tv,0);
abstime.tv_sec= tv.tv_sec + (ndb_cache_check_time / 1000);
abstime.tv_nsec= tv.tv_usec * 1000 + (ndb_cache_check_time % 1000);
if (abstime.tv_nsec >= 1000000000)
{
abstime.tv_sec += 1;
abstime.tv_nsec -= 1000000000;
}
/* Lock mutex and fill list with pointers to all open tables */ /* Lock mutex and fill list with pointers to all open tables */
NDB_SHARE *share; NDB_SHARE *share;
......
...@@ -4646,8 +4646,8 @@ Disable with --skip-ndbcluster (will save memory).", ...@@ -4646,8 +4646,8 @@ Disable with --skip-ndbcluster (will save memory).",
(gptr*) &opt_ndb_optimized_node_selection, (gptr*) &opt_ndb_optimized_node_selection,
(gptr*) &opt_ndb_optimized_node_selection, (gptr*) &opt_ndb_optimized_node_selection,
0, GET_BOOL, OPT_ARG, 1, 0, 0, 0, 0, 0}, 0, GET_BOOL, OPT_ARG, 1, 0, 0, 0, 0, 0},
{ "ndb_cache_check_time", OPT_NDB_CACHE_CHECK_TIME, { "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 update cached commit count value at the given interval(milliseconds).",
(gptr*) &opt_ndb_cache_check_time, (gptr*) &opt_ndb_cache_check_time, 0, GET_ULONG, REQUIRED_ARG, (gptr*) &opt_ndb_cache_check_time, (gptr*) &opt_ndb_cache_check_time, 0, GET_ULONG, REQUIRED_ARG,
0, 0, LONG_TIMEOUT, 0, 1, 0}, 0, 0, LONG_TIMEOUT, 0, 1, 0},
#endif #endif
......
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