Commit 7c57549a authored by unknown's avatar unknown

Merge mysql.com:/home/stewart/Documents/MySQL/4.0/main

into  mysql.com:/home/stewart/Documents/MySQL/4.1/main


sql/slave.cc:
  Auto merged
parents c663aa89 7f8b2334
...@@ -3333,6 +3333,7 @@ err: ...@@ -3333,6 +3333,7 @@ err:
net_end(&thd->net); // destructor will not free it, because net.vio is 0 net_end(&thd->net); // destructor will not free it, because net.vio is 0
pthread_mutex_lock(&LOCK_thread_count); pthread_mutex_lock(&LOCK_thread_count);
THD_CHECK_SENTRY(thd); THD_CHECK_SENTRY(thd);
close_thread_tables(thd);
delete thd; delete thd;
pthread_mutex_unlock(&LOCK_thread_count); pthread_mutex_unlock(&LOCK_thread_count);
pthread_cond_broadcast(&mi->stop_cond); // tell the world we are done pthread_cond_broadcast(&mi->stop_cond); // tell the world we are done
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment