summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <istruewing@chilla.local>2006-12-01 15:49:49 +0100
committerunknown <istruewing@chilla.local>2006-12-01 15:49:49 +0100
commita9e4e6ad4d68b89db6e251a99f45ebdcaaf0a7f8 (patch)
treee3e452868cc9346973cb0b3571337d443ec36b96 /sql
parent7c9c5409a37abae232000d6dd393a6e958ad64a6 (diff)
parentfcbfc0c6956fa0a8e80a0b2d7652385e51105a24 (diff)
downloadmariadb-git-a9e4e6ad4d68b89db6e251a99f45ebdcaaf0a7f8.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')
-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
}