From 1713d49473601ce88dd21bdbfec15651028b90ac Mon Sep 17 00:00:00 2001
From: "rafal@quant.(none)" <>
Date: Mon, 28 May 2007 21:14:57 +0200
Subject: [PATCH 1/2] BUG#21132 (Slave fails to reconnect on update_slave_list)

This is a one liner which will fix semantics if SHOW SLAVE HOSTS to
display the list of slaves currently registered on the host on which
it was issued.
---
 sql/slave.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sql/slave.cc b/sql/slave.cc
index f89a56e2087..05d5499ecb8 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -2020,7 +2020,7 @@ connected:
       on with life.
     */
     thd->proc_info = "Registering slave on master";
-    if (register_slave_on_master(mysql) ||  update_slave_list(mysql, mi))
+    if (register_slave_on_master(mysql))
       goto err;
   }
 

From 80e419b34d8e3194a4f03e181c6c19c50a1bba91 Mon Sep 17 00:00:00 2001
From: "rafal@quant.(none)" <>
Date: Thu, 31 May 2007 10:17:16 +0200
Subject: [PATCH 2/2] BUG#21123 (Slave fails to reconnect on
 update_slave_list):

 Fixing comments and adding error message if slave fails to register
 on master.
---
 sql/slave.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sql/slave.cc b/sql/slave.cc
index 05d5499ecb8..ba62d94d602 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -2016,12 +2016,13 @@ connected:
   {
     /*
       Register ourselves with the master.
-      If fails, this is not fatal - we just print the error message and go
-      on with life.
     */
     thd->proc_info = "Registering slave on master";
     if (register_slave_on_master(mysql))
+    {
+      sql_print_error("Slave I/O thread couldn't register on master");
       goto err;
+    }
   }
 
   DBUG_PRINT("info",("Starting reading binary log from master"));