Commit 67bd9525 authored by unknown's avatar unknown
Browse files

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca 

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca


sql/ha_ndbcluster.cc:
  manual merge
parents a304bcac f9315b16

sql/ha_ndbcluster.cc

+25 −9
Original line number Diff line number Diff line
@@ -8499,6 +8499,8 @@ pthread_handler_t ndb_util_thread_func(void *arg __attribute__((unused))) 
  ndbcluster_find_all_files(thd);

#endif



  uint share_list_size= 0;

  NDB_SHARE **share_list= NULL;

  set_timespec(abstime, 0);

  for (;;)

  {
@@ -8535,7 +8537,22 @@ pthread_handler_t ndb_util_thread_func(void *arg __attribute__((unused))) 
    /* Lock mutex and fill list with pointers to all open tables */

    NDB_SHARE *share;

    pthread_mutex_lock(&ndbcluster_mutex);

    for (uint i= 0; i < ndbcluster_open_tables.records; i++)

    uint i, record_count= ndbcluster_open_tables.records;

    if (share_list_size < record_count)

    {

      NDB_SHARE ** new_share_list= new NDB_SHARE * [record_count];

      if (!new_share_list)

      {

        sql_print_warning("ndb util thread: malloc failure, "

                          "query cache not maintained properly");

        pthread_mutex_unlock(&ndbcluster_mutex);

        goto next;                               // At least do not crash

      }

      delete [] share_list;

      share_list_size= record_count;

      share_list= new_share_list;

    }

    for (i= 0; i < record_count; i++)

    {

      share= (NDB_SHARE *)hash_element(&ndbcluster_open_tables, i);

#ifdef HAVE_NDB_BINLOG
@@ -8550,14 +8567,14 @@ pthread_handler_t ndb_util_thread_func(void *arg __attribute__((unused))) 
                  i, share->table_name, share->use_count));



      /* Store pointer to table */

      util_open_tables.push_back(share);

      share_list[i]= share;

    }

    pthread_mutex_unlock(&ndbcluster_mutex);



    /* Iterate through the open files list */

    List_iterator_fast<NDB_SHARE> it(util_open_tables);

    while ((share= it++))

    for (i= 0; i < record_count; i++)

    {

      share= share_list[i];

#ifdef HAVE_NDB_BINLOG

      if ((share->use_count - (int) (share->op != 0) - (int) (share->op != 0))

          <= 1)
@@ -8611,10 +8628,7 @@ pthread_handler_t ndb_util_thread_func(void *arg __attribute__((unused))) 
      /* Decrease the use count and possibly free share */

      free_share(&share);

    }



    /* Clear the list of open tables */

    util_open_tables.empty();



next:

    /* Calculate new time to wake up */

    int secs= 0;

    int msecs= ndb_cache_check_time;
@@ -8642,6 +8656,8 @@ pthread_handler_t ndb_util_thread_func(void *arg __attribute__((unused))) 
ndb_util_thread_end:

  net_end(&thd->net);

ndb_util_thread_fail:

  if (share_list)

    delete [] share_list;

  thd->cleanup();

  delete thd;