mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
bookkeeping commit - bk will not let me pull Monty's changes until I commit mine to my repository - this will not be pushed
sql/mysqld.cc: added explict net->timeout set to net_read_timeout before handshake
This commit is contained in:
@@ -876,8 +876,9 @@ void end_thread(THD *thd, bool put_in_cache)
|
||||
thread_count--;
|
||||
delete thd;
|
||||
|
||||
if (cached_thread_count < thread_cache_size && ! abort_loop &&
|
||||
!kill_cached_threads)
|
||||
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 */
|
||||
DBUG_PRINT("info", ("Adding thread to cache"))
|
||||
@@ -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;
|
||||
}
|
||||
|
Reference in New Issue
Block a user