diff options
| -rw-r--r-- | sql-common/client.c | 1 | ||||
| -rw-r--r-- | sql/slave.cc | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index 68878df50e8..1941e6bc517 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -133,6 +133,7 @@ static void mysql_close_free(MYSQL *mysql); static int wait_for_data(my_socket fd, uint timeout); #endif + /**************************************************************************** A modified version of connect(). my_connect() allows you to specify a timeout value, in seconds, that we should wait until we diff --git a/sql/slave.cc b/sql/slave.cc index 7fb7fbdade4..cb37a798037 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -3056,6 +3056,9 @@ dump"); } thd->proc_info= "Waiting to reconnect after a failed binlog dump request"; +#ifdef SIGNAL_WITH_VIO_CLOSE + thd->clear_active_vio(); +#endif end_server(mysql); /* First time retry immediately, assuming that we can recover @@ -3129,6 +3132,9 @@ max_allowed_packet", goto err; } thd->proc_info = "Waiting to reconnect after a failed master event read"; +#ifdef SIGNAL_WITH_VIO_CLOSE + thd->clear_active_vio(); +#endif end_server(mysql); if (retry_count++) { @@ -4383,4 +4389,5 @@ template class I_List_iterator<i_string>; template class I_List_iterator<i_string_pair>; #endif + #endif /* HAVE_REPLICATION */ |