diff options
| author | Luis Soares <luis.soares@sun.com> | 2009-06-26 00:20:14 +0100 |
|---|---|---|
| committer | Luis Soares <luis.soares@sun.com> | 2009-06-26 00:20:14 +0100 |
| commit | 626d3e1d6ba3eaed9574070b4497730bac93acb5 (patch) | |
| tree | 1661d084d98b738cb69cc80888852ad8f323d438 /sql/slave.cc | |
| parent | 42aaea8c3cbd78f6a8c926e5985a7b7212f16234 (diff) | |
| parent | 11f1ab1069b63b6b6cc445b538e1daffa848d6d7 (diff) | |
| download | mariadb-git-626d3e1d6ba3eaed9574070b4497730bac93acb5.tar.gz | |
local merge: 5.1-bt bug branch --> 5.1-bt latest
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 5570a07c02d..0270db9253d 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -2418,6 +2418,7 @@ pthread_handler_t handle_slave_io(void *arg) pthread_detach_this_thread(); thd->thread_stack= (char*) &thd; // remember where our stack is + mi->clear_error(); if (init_slave_thread(thd, SLAVE_THD_IO)) { pthread_cond_broadcast(&mi->start_cond); @@ -2532,6 +2533,7 @@ requesting master dump") || goto connected; }); + DBUG_ASSERT(mi->last_error().number == 0); while (!io_slave_killed(thd,mi)) { ulong event_len; @@ -3731,6 +3733,7 @@ static int connect_to_master(THD* thd, MYSQL* mysql, Master_info* mi, if (!slave_was_killed) { + mi->clear_error(); // clear possible left over reconnect error if (reconnect) { if (!suppress_warnings && global_system_variables.log_warnings) |