diff options
| author | monty@mysql.com <> | 2005-07-28 17:09:54 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2005-07-28 17:09:54 +0300 |
| commit | 15d48525afc66df10f8f4e68c0a33a4e3ef2ae8c (patch) | |
| tree | efa95d21efbbc033b0cabce038118a09be44e9ac /sql/slave.cc | |
| parent | b3cbd0048fe5fe36fe4fba9ce591b0d1b26e10a1 (diff) | |
| parent | 3c12d0ae54eccaef7c265af4f782d95250308dc9 (diff) | |
| download | mariadb-git-15d48525afc66df10f8f4e68c0a33a4e3ef2ae8c.tar.gz | |
Merge mysql.com:/home/my/mysql-4.1
into mysql.com:/home/my/mysql-5.0
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 86611566b93..eed70b01cd2 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -3637,9 +3637,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 |