diff options
| author | Andrei Elkin <aelkin@mysql.com> | 2009-04-30 15:47:09 +0300 |
|---|---|---|
| committer | Andrei Elkin <aelkin@mysql.com> | 2009-04-30 15:47:09 +0300 |
| commit | fbacc10cbb981ee5773617298d1cf11998fde144 (patch) | |
| tree | c465d55230e7aa892fea403e301587c62c57fb64 /sql | |
| parent | 823826a7cb4da1663d1f54ce16cc8aeaf593d6d9 (diff) | |
| parent | b3190a4528b634199ab5e4aefc97bd4d7ecdb95d (diff) | |
| download | mariadb-git-fbacc10cbb981ee5773617298d1cf11998fde144.tar.gz | |
merge bug#44179 fixes to 5.1-bt
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_repl.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index 6285a2dfb55..06c6c022780 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -1026,7 +1026,10 @@ int reset_slave(THD *thd, Master_info* mi) if ((error= purge_relay_logs(&mi->rli, thd, 1 /* just reset */, &errmsg))) + { + sql_errno= ER_RELAY_LOG_FAIL; goto err; + } /* Clear master's log coordinates and reset host/user/etc to the values |