merge bug#44179 fixes to 5.1-bt

9a89e377 · Andrei Elkin · 9f400cf9 · d04e43eb · 9a89e377
Commit 9a89e377 authored Apr 30, 2009 by Andrei Elkin
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

sql/sql_repl.cc sql/sql_repl.cc +3 -0

No files found.
--- 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