From 61c0e4c01c06ef8917f09d6fee20026b6e62e5f7 Mon Sep 17 00:00:00 2001 From: unknown 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: Remove call to update_slave_list() which was executing "SHOW SLAVE HOSTS" on master and populating slave_list based on the output. --- 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 48b32bdd0a9ae119d9a73e1daa7ad58416812800 Mon Sep 17 00:00:00 2001 From: unknown 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: Failing to register on master is a fatal error. --- 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"));