merge bug#44179 fixes to 5.1-bt

17 years ago · fbacc10cbb
1 changed files with 3 additions and 0 deletions
--- 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