diff options
author | monty@mysql.com <> | 2005-07-26 17:55:58 +0300 |
---|---|---|
committer | monty@mysql.com <> | 2005-07-26 17:55:58 +0300 |
commit | 4098c40d87ac11fe5043061f16a95a455376a782 (patch) | |
tree | 91bfa7092c665b2c4842cc67bff19a328d434aa4 /sql/slave.cc | |
parent | d9bacfa236ceaf1b91caf6197122ad01ad8bfe37 (diff) | |
download | mariadb-git-4098c40d87ac11fe5043061f16a95a455376a782.tar.gz |
Review fixes:
Fixed portability problem with bool in C programs
Moved close_thread_tables out from LOCK_thread_count mutex (safety fix)
my_sleep() -> pthread_cond_timedwait()
Diffstat (limited to 'sql/slave.cc')
-rw-r--r-- | sql/slave.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index 6132d334dbb..5e3d073b38a 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -2719,9 +2719,9 @@ err: mi->abort_slave = 0; // TODO: check if this is needed DBUG_ASSERT(thd->net.buff != 0); net_end(&thd->net); // destructor will not free it, because net.vio is 0 + close_thread_tables(thd, 0); pthread_mutex_lock(&LOCK_thread_count); THD_CHECK_SENTRY(thd); - close_thread_tables(thd); delete thd; pthread_mutex_unlock(&LOCK_thread_count); pthread_cond_broadcast(&mi->stop_cond); // tell the world we are done |