database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

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

Browse Source 
client.c:
  Removed call to clear_slave_vio in end_server().  Removed header declaration of clear_slave_vio
slave.cc:
  Removed clear_slave_vio function and added calls to thd->clear_active_vio before each call to end_server()
This commit is contained in:
rburnett@build.mysql.com
2004-08-23 18:55:12 +02:00
parent 3bd71971d6
commit 680aa3d69d
2 changed files with 6 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql-common/client.c
View File

@@ -133,10 +133,6 @@ static void mysql_close_free(MYSQL *mysql);
static int wait_for_data(my_socket fd, uint timeout);
#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
@@ -823,12 +819,6 @@ void end_server(MYSQL *mysql)
init_sigpipe_variables
DBUG_PRINT("info",("Net: %s", vio_description(mysql->net.vio)));
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);
reset_sigpipe(mysql);
mysql->net.vio= 0; /* Marker */