summaryrefslogtreecommitdiff
path: root/sql/sql_insert.cc
diff options
context:
space:
mode:
authorsvoj@april.(none) <>2006-11-07 17:29:56 +0400
committersvoj@april.(none) <>2006-11-07 17:29:56 +0400
commitc4de52d0dbc3c5f4cfb8e67f47ed0607b9bdf5b4 (patch)
treedffe45c4d29cf1169ab2ab3fef8bc09fbaa76963 /sql/sql_insert.cc
parenta5b51d0affc8c47ab90dd694baa0452118467371 (diff)
parentc7776b8a491dd0c1a2f4e3508e14327daf61c623 (diff)
downloadmariadb-git-c4de52d0dbc3c5f4cfb8e67f47ed0607b9bdf5b4.tar.gz
Merge mysql.com:/home/svoj/devel/mysql/BUG23312/mysql-5.0-engines
into mysql.com:/home/svoj/devel/mysql/BUG23312/mysql-5.1-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 4dcbf9af4a0..d7d86e1f8ff 100644
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -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
}