Commit 0e3c0305 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/svoj/devel/mysql/BUG23312/mysql-4.1-engines 

into  mysql.com:/home/svoj/devel/mysql/BUG23312/mysql-5.0-engines


sql/sql_insert.cc:
  Auto merged
parents e38cd8ab a44762bc

sql/sql_insert.cc

+0 −3
Original line number Diff line number Diff line
@@ -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

}