Commit b3190a45 authored by Andrei Elkin's avatar Andrei Elkin

Bug #44179 reset slave crashes in my_error when reset_logs returns non-zero

my_error() was invoked in reset_slave()'s with purge_relay_logs()-failing branch
without passing sql_errno to it.

Fixed with setting sql_errno= ER_RELAY_LOG_FAIL in the purge_relay_logs()-failing branch.
parent db7703b3
...@@ -1026,7 +1026,10 @@ int reset_slave(THD *thd, Master_info* mi) ...@@ -1026,7 +1026,10 @@ int reset_slave(THD *thd, Master_info* mi)
if ((error= purge_relay_logs(&mi->rli, thd, if ((error= purge_relay_logs(&mi->rli, thd,
1 /* just reset */, 1 /* just reset */,
&errmsg))) &errmsg)))
{
sql_errno= ER_RELAY_LOG_FAIL;
goto err; goto err;
}
/* /*
Clear master's log coordinates and reset host/user/etc to the values Clear master's log coordinates and reset host/user/etc to the values
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment