database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

fix test suite

Browse Source
This commit is contained in:
Vladislav Vaintroub
2011-12-27 16:10:34 +01:00
parent c01fc2abc7
commit 27ef2fda98
4 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/threadpool_common.cc
View File

@ -71,7 +71,9 @@ static inline bool thread_attach(THD* thd, char *stack_start, PSI_thread **save_
static inline void thread_detach(THD* thd, PSI_thread *restore_psi_thread)
{
DBUG_ENTER("thread_detach");
mysql_mutex_lock(&thd->LOCK_thd_data);
thd->mysys_var = NULL;
mysql_mutex_unlock(&thd->LOCK_thd_data);
#ifndef DBUG_OFF
/*
If during the session @@session.dbug was assigned, the
@ -161,7 +163,7 @@ int threadpool_process_request(THD *thd)
PSI_thread *psi_thread;
thread_attach(thd, (char *)&thd, &psi_thread);
if (thd->killed == KILL_CONNECTION)
if (thd->killed >= KILL_CONNECTION)
{
/*
kill flag can be set have been killed by