Merge mysql.com:/home/svoj/devel/mysql/BUG23312/mysql-5.0-engines

into  mysql.com:/home/svoj/devel/mysql/BUG23312/mysql-5.1-engines
This commit is contained in:
svoj@april.(none) 2006-11-07 17:29:56 +04:00
commit c4de52d0db

View File

@ -1806,8 +1806,6 @@ void kill_delayed_threads(void)
delayed_insert *tmp;
while ((tmp=it++))
{
/* Ensure that the thread doesn't kill itself while we are looking at it */
pthread_mutex_lock(&tmp->mutex);
tmp->thd.killed= THD::KILL_CONNECTION;
if (tmp->thd.mysys_var)
{
@ -1826,7 +1824,6 @@ void kill_delayed_threads(void)
}
pthread_mutex_unlock(&tmp->thd.mysys_var->mutex);
}
pthread_mutex_unlock(&tmp->mutex);
}
VOID(pthread_mutex_unlock(&LOCK_delayed_insert)); // For unlink from list
}