Commit 81a28311 authored by unknown's avatar unknown
Browse files

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

into neptunus.(none):/home/msvensson/mysql/mysql-5.0
parents 9cba39ca ecde7832

sql/ha_ndbcluster.cc

+11 −2
Original line number Diff line number Diff line
@@ -5746,7 +5746,7 @@ extern "C" pthread_handler_decl(ndb_util_thread_func, 
  }



  List<NDB_SHARE> util_open_tables;

  set_timespec(abstime, ndb_cache_check_time);

  set_timespec(abstime, 0);

  for (;;)

  {
@@ -5764,12 +5764,21 @@ extern "C" pthread_handler_decl(ndb_util_thread_func, 


    if (ndb_cache_check_time == 0)

    {

      /* Wake up in 10 seconds to check if value has changed */

      set_timespec(abstime, 10);

      continue;

    }



    /* 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 */

    NDB_SHARE *share;

sql/mysqld.cc

+2 −2
Original line number Diff line number Diff line
@@ -4646,8 +4646,8 @@ Disable with --skip-ndbcluster (will save memory).", 
   (gptr*) &opt_ndb_optimized_node_selection,

   (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.",

  { "ndb-cache-check-time", OPT_NDB_CACHE_CHECK_TIME,

    "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,

    0, 0, LONG_TIMEOUT, 0, 1, 0},

#endif