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

Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1

Browse source 
into build.mysql.com:/users/rburnett/mysql-4.1
This commit is contained in:
rburnett@build.mysql.com 2004-08-23 22:01:16 +02:00
commit 990c5857e5
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
sql-common/client.c
View file

@ -133,6 +133,7 @@ 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
/**************************************************************************** /****************************************************************************
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

7
sql/slave.cc
View file

@ -3056,6 +3056,9 @@ dump");
} }
thd->proc_info= "Waiting to reconnect after a failed binlog dump request"; 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); end_server(mysql);
/* /*
First time retry immediately, assuming that we can recover First time retry immediately, assuming that we can recover
@ -3129,6 +3132,9 @@ max_allowed_packet",
goto err; goto err;
} }
thd->proc_info = "Waiting to reconnect after a failed master event read"; 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); end_server(mysql);
if (retry_count++) if (retry_count++)
{ {
@ -4383,4 +4389,5 @@ 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
#endif /* HAVE_REPLICATION */ #endif /* HAVE_REPLICATION */