Commit c4f1804d authored by msvensson@neptunus.(none)'s avatar msvensson@neptunus.(none)

Manual merge

parents e7cfb0f6 7ddddc71
...@@ -5761,7 +5761,7 @@ extern "C" pthread_handler_decl(ndb_util_thread_func, ...@@ -5761,7 +5761,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 (;;)
{ {
...@@ -5779,12 +5779,21 @@ extern "C" pthread_handler_decl(ndb_util_thread_func, ...@@ -5779,12 +5779,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;
......
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