summaryrefslogtreecommitdiff
path: root/sql/sql_insert.cc
diff options
context:
space:
mode:
authorsvoj@mysql.com/april.(none) <>2006-11-07 17:14:22 +0400
committersvoj@mysql.com/april.(none) <>2006-11-07 17:14:22 +0400
commitc7776b8a491dd0c1a2f4e3508e14327daf61c623 (patch)
treee70b60822d7d8fe7983082ed8cff27afbc0ec148 /sql/sql_insert.cc
parenta8ff7bafb4ee760afed9c13e9c2d7197c9b57159 (diff)
parent24c7b22b4dea568a047f1a0a443dbb454d0bd57e (diff)
downloadmariadb-git-c7776b8a491dd0c1a2f4e3508e14327daf61c623.tar.gz
Merge mysql.com:/home/svoj/devel/mysql/BUG23312/mysql-4.1-engines
into mysql.com:/home/svoj/devel/mysql/BUG23312/mysql-5.0-engines
Diffstat (limited to 'sql/sql_insert.cc')
-rw-r--r--sql/sql_insert.cc3
1 files changed, 0 insertions, 3 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
index 2ce83caa369..53e93cdefc8 100644
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -1745,8 +1745,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)
{
@@ -1765,7 +1763,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
}