bzr commit into mysql-5.1-bugteam branch (aelkin:2878) Bug#44179

[Andrei Elkin]

#At file:///home/andrei/MySQL/BZR/FIXES/5.1-bt-bug44179-child_of_41902-reset_logs_error_assert/ based on revid:alfranio.correia@stripped

 2878 Andrei Elkin	2009-04-30
      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.
modified:
  sql/sql_repl.cc

per-file messages:
  sql/sql_repl.cc
    set sql_errno= ER_RELAY_LOG_FAIL when purge_relay_logs() fails.
=== modified file 'sql/sql_repl.cc'
--- a/sql/sql_repl.cc	2009-02-13 16:41:47 +0000
+++ b/sql/sql_repl.cc	2009-04-30 12:28:07 +0000
@@ -1026,7 +1026,10 @@ int reset_slave(THD *thd, Master_info* m
   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