database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-09 22:24:09 +03:00
Code Activity

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

Browse Source 
sql/mysqld.cc:
  added explict net->timeout set to net_read_timeout before handshake
This commit is contained in:
unknown
2000-08-15 11:42:09 -06:00
parent 99110483b2
commit 6183695e8a
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/mysqld.cc
View File

@@ -876,8 +876,9 @@ void end_thread(THD *thd, bool put_in_cache)
thread_count--; thread_count--;
delete thd; delete thd;
if (cached_thread_count < thread_cache_size && ! abort_loop && if (put_in_cache && cached_thread_count < thread_cache_size
!kill_cached_threads) && ! abort_loop &&
!kill_cached_threads )
{ {
/* Don't kill the thread, just put it in cache for reuse */ /* Don't kill the thread, just put it in cache for reuse */
DBUG_PRINT("info", ("Adding thread to cache")) DBUG_PRINT("info", ("Adding thread to cache"))
@@ -891,8 +892,8 @@ void end_thread(THD *thd, bool put_in_cache)
{ {
wake_thread--; wake_thread--;
thd=thread_cache.get(); thd=thread_cache.get();
threads.append(thd);
(void) thd->store_globals(); (void) thd->store_globals();
threads.append(thd);
pthread_mutex_unlock(&LOCK_thread_count); pthread_mutex_unlock(&LOCK_thread_count);
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }