diff options
| author | unknown <monty@mysql.com> | 2005-07-27 13:24:59 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-07-27 13:24:59 +0300 |
| commit | 5fbfa29505dd51c223eb9b9fca7e06056da75a06 (patch) | |
| tree | 7f3dd2c80370d2c811475198141e5ab89b19adb0 /sql/slave.cc | |
| parent | a5a7cc0bc850aca7bfab7dfd20d5bca4f4a67c33 (diff) | |
| parent | a5240d7d8f004f92d064b7500d2a12e26b96f2d0 (diff) | |
| download | mariadb-git-5fbfa29505dd51c223eb9b9fca7e06056da75a06.tar.gz | |
Merge mysql.com:/home/my/mysql-4.0
into mysql.com:/home/my/mysql-4.1
BitKeeper/etc/ignore:
auto-union
include/thr_lock.h:
Auto merged
mysys/thr_lock.c:
Auto merged
sql/lock.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_base.cc:
Simple merge
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 b0d219e5dd5..f25ad90487a 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -3331,9 +3331,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 |