summaryrefslogtreecommitdiff
path: root/sql/sql_insert.cc
diff options
context:
space:
mode:
authoristruewing@chilla.local <>2006-11-13 21:49:00 +0100
committeristruewing@chilla.local <>2006-11-13 21:49:00 +0100
commitc378a8ee49f01ce3236f18b8202fb707dad88155 (patch)
tree82c3ddd83a6636620d5692f7740567c001e40857 /sql/sql_insert.cc
parentcddbb0f8173800fd8431be4df178bc042702b9eb (diff)
parent24c7b22b4dea568a047f1a0a443dbb454d0bd57e (diff)
downloadmariadb-git-c378a8ee49f01ce3236f18b8202fb707dad88155.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into chilla.local:/home/mydev/mysql-4.1-axmrg
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 43c7e5d456f..d6c746d5d5d 100644
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -1179,8 +1179,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=1;
if (tmp->thd.mysys_var)
{
@@ -1199,7 +1197,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
}