1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug #4629 Crash after SLAVE STOP, if the IO thread is in special state.

Browse Source 
client.c:
  Added call to clear_slave_vio inside end_server only when under Windows with repliaction
slave.cc:
  Added clear_slave_vio function for clearing active vio on THD under Windows replication
This commit is contained in:
rburnett@build.mysql.com 2004-08-21 05:07:32 +02:00
parent 02f9e068b9
commit 3bd71971d6
2 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sql-common/client.c
View File

@ -133,6 +133,11 @@ static void mysql_close_free(MYSQL *mysql);
static int wait_for_data(my_socket fd, uint timeout); static int wait_for_data(my_socket fd, uint timeout);
#endif #endif
#if defined(__WIN__) && defined(HAVE_REPLICATION) && defined(MYSQL_SERVER)
void clear_slave_vio( MYSQL* mysql );
#endif
/**************************************************************************** /****************************************************************************
A modified version of connect(). my_connect() allows you to specify A modified version of connect(). my_connect() allows you to specify
a timeout value, in seconds, that we should wait until we a timeout value, in seconds, that we should wait until we
@ -818,6 +823,12 @@ void end_server(MYSQL *mysql)
init_sigpipe_variables init_sigpipe_variables
DBUG_PRINT("info",("Net: %s", vio_description(mysql->net.vio))); DBUG_PRINT("info",("Net: %s", vio_description(mysql->net.vio)));
set_sigpipe(mysql); set_sigpipe(mysql);
#if defined(__WIN__) && defined(HAVE_REPLICATION) && defined(MYSQL_SERVER)
/* if this mysql is one of our connections to the master, then clear it */
clear_slave_vio( mysql );
#endif
vio_delete(mysql->net.vio); vio_delete(mysql->net.vio);
reset_sigpipe(mysql); reset_sigpipe(mysql);
mysql->net.vio= 0; /* Marker */ mysql->net.vio= 0; /* Marker */

22
sql/slave.cc
View File

@ -4383,4 +4383,26 @@ template class I_List_iterator<i_string>;
template class I_List_iterator<i_string_pair>; template class I_List_iterator<i_string_pair>;
#endif #endif
#ifdef __WIN__
extern "C" void clear_slave_vio( MYSQL* mysql )
{
if (active_mi->mysql == mysql)
active_mi->io_thd->clear_active_vio();
/* TODO: use code like below when multi-master is in place */
/* LIST *cur = &master_list;
if (((MASTER_INFO*)cur->data)->mysql == mysql)
{
MASTER_INFO *mi = (MASTER_INFO*)cur->data;
mi->io_thd->clear_active_vio();
return;
}
else
cur = cur->next;*/
}
#endif
#endif /* HAVE_REPLICATION */ #endif /* HAVE_REPLICATION */