mirror of
https://github.com/MariaDB/server.git
synced 2026-04-26 18:25:30 +02:00
Merge mysql.com:/home/svoj/devel/mysql/BUG23312/mysql-4.1-engines
into mysql.com:/home/svoj/devel/mysql/BUG23312/mysql-5.0-engines sql/sql_insert.cc: Auto merged
This commit is contained in:
commit
0e3c030558
1 changed files with 0 additions and 3 deletions
|
|
@ -1745,8 +1745,6 @@ void kill_delayed_threads(void)
|
||||||
delayed_insert *tmp;
|
delayed_insert *tmp;
|
||||||
while ((tmp=it++))
|
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;
|
tmp->thd.killed= THD::KILL_CONNECTION;
|
||||||
if (tmp->thd.mysys_var)
|
if (tmp->thd.mysys_var)
|
||||||
{
|
{
|
||||||
|
|
@ -1765,7 +1763,6 @@ void kill_delayed_threads(void)
|
||||||
}
|
}
|
||||||
pthread_mutex_unlock(&tmp->thd.mysys_var->mutex);
|
pthread_mutex_unlock(&tmp->thd.mysys_var->mutex);
|
||||||
}
|
}
|
||||||
pthread_mutex_unlock(&tmp->mutex);
|
|
||||||
}
|
}
|
||||||
VOID(pthread_mutex_unlock(&LOCK_delayed_insert)); // For unlink from list
|
VOID(pthread_mutex_unlock(&LOCK_delayed_insert)); // For unlink from list
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue