diff options
| author | Jan Lindström <jplindst@mariadb.org> | 2014-04-16 12:13:43 +0300 |
|---|---|---|
| committer | Jan Lindström <jplindst@mariadb.org> | 2014-04-16 12:13:43 +0300 |
| commit | 150e88e8c9b85e3e6ce500a91fd215d231e99881 (patch) | |
| tree | e029a8c9beae4cf67edc5239694c68f8b4de28c0 /sql/slave.cc | |
| parent | 983366e0eef50b95329bcba154ee4fb38b85df3c (diff) | |
| parent | 142c20eda9d287f7f898dd8d89821f0e809dafc6 (diff) | |
| download | mariadb-git-150e88e8c9b85e3e6ce500a91fd215d231e99881.tar.gz | |
Merge from lp:maria/5.5 to maria-5.5.37 release revision 4154.
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index 75765ca13e2..7469f28457d 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -1220,6 +1220,7 @@ bool is_network_error(uint errorno) errorno == ER_CON_COUNT_ERROR || errorno == ER_CONNECTION_KILLED || errorno == ER_NEW_ABORTING_CONNECTION || + errorno == ER_NET_READ_INTERRUPTED || errorno == ER_SERVER_SHUTDOWN) return TRUE; @@ -3358,6 +3359,7 @@ err: } write_ignored_events_info_to_relay_log(thd, mi); thd_proc_info(thd, "Waiting for slave mutex on exit"); + thd->add_status_to_global(); mysql_mutex_lock(&mi->run_lock); err_during_init: @@ -3753,6 +3755,7 @@ the slave SQL thread with \"SLAVE START\". We stopped at log \ thd->catalog= 0; thd->reset_query(); thd->reset_db(NULL, 0); + thd->add_status_to_global(); thd_proc_info(thd, "Waiting for slave mutex on exit"); mysql_mutex_lock(&rli->run_lock); err_during_init: |