From b3190a4528b634199ab5e4aefc97bd4d7ecdb95d Mon Sep 17 00:00:00 2001
From: Andrei Elkin <aelkin@mysql.com>
Date: Thu, 30 Apr 2009 15:28:07 +0300
Subject: [PATCH] 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.
---
 sql/sql_repl.cc | 3 +++
 1 file changed, 3 insertions(+)

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