mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 11:31:51 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl

Browse source 
into  romeo.(none):/home/bkroot/mysql-5.1-new-rpl
This commit is contained in:
mats@romeo.(none) 2006-07-07 15:25:19 +02:00
commit 083347db23
1 changed files with 536 additions and 537 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
sql/slave.cc
View file

@ -3533,15 +3533,12 @@ err:
write_ignored_events_info_to_relay_log(thd, mi);
thd->proc_info = "Waiting for slave mutex on exit";
pthread_mutex_lock(&mi->run_lock);
mi->slave_running = 0;
mi->io_thd = 0;
/* Forget the relay log's format */
delete mi->rli.relay_log.description_event_for_queue;
mi->rli.relay_log.description_event_for_queue= 0;
// TODO: make rpl_status part of MASTER_INFO
change_rpl_status(RPL_ACTIVE_SLAVE,RPL_IDLE_SLAVE);
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);
@ -3552,6 +3549,9 @@ err:
pthread_cond_broadcast(&mi->stop_cond); // tell the world we are done
pthread_mutex_unlock(&mi->run_lock);
my_thread_end();
mi->abort_slave = 0;
mi->slave_running = 0;
mi->io_thd = 0;
pthread_exit(0);
DBUG_RETURN(0); // Can't return anything here
}
@ -5106,4 +5106,3 @@ template class I_List_iterator<i_string_pair>;
#endif
#endif /* HAVE_REPLICATION */