List:Commits« Previous MessageNext Message »
From:rsomla Date:May 31 2007 8:17am
Subject:bk commit into 5.1 tree (rafal:1.2517) BUG#21123
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of rafal. When rafal does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository

ChangeSet@stripped, 2007-05-31 10:17:16+02:00, rafal@quant.(none) +1 -0
  BUG#21123 (Slave fails to reconnect on update_slave_list):
   Fixing comments and adding error message if slave fails to register
   on master.

  sql/, 2007-05-31 10:17:13+02:00, rafal@quant.(none) +3 -2
    Failing to register on master is a fatal error.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	rafal
# Host:	quant.(none)
# Root:	/ext/mysql/bk/mysql-5.1-bug21123

--- 1.308/sql/	2007-05-31 10:17:21 +02:00
+++ 1.309/sql/	2007-05-31 10:17:21 +02:00
@@ -2016,12 +2016,13 @@
       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"));
bk commit into 5.1 tree (rafal:1.2517) BUG#21123rsomla31 May