diff options
author | unknown <istruewing@chilla.local> | 2006-12-08 12:20:48 +0100 |
---|---|---|
committer | unknown <istruewing@chilla.local> | 2006-12-08 12:20:48 +0100 |
commit | 605f62ce32f6f705b0a3e35d0ac1f61eadbb0eea (patch) | |
tree | 1073b3844bbdd54dc05c09a896e56a285196fdfc /sql | |
parent | c586037a45a8f88c66540a141f20ff67c0a73319 (diff) | |
parent | df15a3e2b8954d72080f8d2895247e7441b3b7e3 (diff) | |
download | mariadb-git-605f62ce32f6f705b0a3e35d0ac1f61eadbb0eea.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.cc | 3 |
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 } |