Commit 57ef3ccc authored by sasha@mysql.sashanet.com's avatar sasha@mysql.sashanet.com
Browse files

bookkeeping commit - bk will not let me pull Monty's changes until I commit... 

bookkeeping commit - bk will not let me pull Monty's changes until I commit mine to my repository - this will not be pushed
parent 807460bb

sql/mysqld.cc

+4 −3
Original line number Diff line number Diff line
@@ -876,7 +876,8 @@ void end_thread(THD *thd, bool put_in_cache) 
  thread_count--;

  delete thd;

  

  if (cached_thread_count < thread_cache_size && ! abort_loop &&

  if (put_in_cache && cached_thread_count < thread_cache_size

      && ! abort_loop &&

      !kill_cached_threads )

  {

    /* Don't kill the thread, just put it in cache for reuse */
@@ -891,8 +892,8 @@ void end_thread(THD *thd, bool put_in_cache) 
    {

      wake_thread--;

      thd=thread_cache.get();

      threads.append(thd);

      (void) thd->store_globals();

      threads.append(thd);

      pthread_mutex_unlock(&LOCK_thread_count);

      DBUG_VOID_RETURN;

    }