diff options
| author | unknown <rburnett@build.mysql.com> | 2004-08-23 22:01:16 +0200 |
|---|---|---|
| committer | unknown <rburnett@build.mysql.com> | 2004-08-23 22:01:16 +0200 |
| commit | 916a028c36819c68db8325396faa3584a2941aef (patch) | |
| tree | 9bdca02c1d905469953f8ced4396163b507bb795 /sql | |
| parent | 8f405690f1e3821c2d6be84ac235787ef34ae614 (diff) | |
| parent | e0a12e898c1645b450c69503d481ab1f92d1e012 (diff) | |
| download | mariadb-git-916a028c36819c68db8325396faa3584a2941aef.tar.gz | |
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
into build.mysql.com:/users/rburnett/mysql-4.1
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/slave.cc | 7 |
1 files changed, 7 insertions, 0 deletions
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 */ |