diff options
| author | <Li-Bing.Song@sun.com> | 2010-10-09 18:18:16 +0800 |
|---|---|---|
| committer | <Li-Bing.Song@sun.com> | 2010-10-09 18:18:16 +0800 |
| commit | a667ce8e27971949ba4232b0de8f1516a2ba2f27 (patch) | |
| tree | 66f7f00a55a5726cfc4ba7b61a009cacb7475072 /sql/slave.cc | |
| parent | 31e1b12eb0fb67d3d65973fb1cd574be64373e04 (diff) | |
| parent | b66825912a436cb263253bf47c535f3728ccbe85 (diff) | |
| download | mariadb-git-a667ce8e27971949ba4232b0de8f1516a2ba2f27.tar.gz | |
Manual merge
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index dff6b6946d4..3e77a5e7516 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -2534,9 +2534,7 @@ static int exec_relay_log_event(THD* thd, Relay_log_info* rli) else { exec_res= 0; - trans_rollback(thd); - close_thread_tables(thd); - thd->mdl_context.release_transactional_locks(); + rli->cleanup_context(thd, 1); /* chance for concurrent connection to get more locks */ safe_sleep(thd, min(rli->trans_retries, MAX_SLAVE_RETRY_PAUSE), (CHECK_KILLED_FUNC)sql_slave_killed, (void*)rli); @@ -3385,6 +3383,7 @@ the slave SQL thread with \"SLAVE START\". We stopped at log \ request is detected only by the present function, not by events), so we must "proactively" clear playgrounds: */ + thd->clear_error(); rli->cleanup_context(thd, 1); /* Some extra safety, which should not been needed (normally, event deletion |