diff options
| author | unknown <knielsen@knielsen-hq.org> | 2013-11-14 15:08:29 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2013-11-14 15:08:29 +0100 |
| commit | def3c98af47a95981437de3ccee8bc1a736cd4a7 (patch) | |
| tree | 438b53f9cd2a2df15e829c2060368b815b4462b3 /sql/slave.cc | |
| parent | bdd883ed9a68ff1e82528cc6b33316d98894cfd2 (diff) | |
| download | mariadb-git-def3c98af47a95981437de3ccee8bc1a736cd4a7.tar.gz | |
MDEV-5291: Slave transaction retry on temporary error leaves dangling error in SHOW SLAVE STATUS
Make sure to clear the temporary error before the retry.
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index 1907e704e3d..76c9a100104 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -3453,6 +3453,7 @@ static int exec_relay_log_event(THD* thd, Relay_log_info* rli, if (exec_res && (temp_err= has_temporary_error(thd))) { const char *errmsg; + rli->clear_error(); /* We were in a transaction which has been rolled back because of a temporary error; |