diff options
| author | unknown <rburnett@build.mysql.com> | 2004-08-23 18:55:12 +0200 |
|---|---|---|
| committer | unknown <rburnett@build.mysql.com> | 2004-08-23 18:55:12 +0200 |
| commit | e0a12e898c1645b450c69503d481ab1f92d1e012 (patch) | |
| tree | c5bf711b1c67e73106654dc6c6d3205446f52a49 /sql-common | |
| parent | 2eb954a27a6aa6bf0f4e9c480dc8a633649595f1 (diff) | |
| download | mariadb-git-e0a12e898c1645b450c69503d481ab1f92d1e012.tar.gz | |
Bug #4629 Crash after SLAVE STOP, if the IO thread is in special state.
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()
sql/slave.cc:
Removed clear_slave_vio function and added calls to thd->clear_active_vio before each call to end_server()
sql-common/client.c:
Removed call to clear_slave_vio in end_server(). Removed header declaration of clear_slave_vio
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/client.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index dc0889a3ba8..1941e6bc517 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -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 */ |