1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge quant.(none):/ext/mysql/bk/mysql-5.1-bug21123

Browse Source 
into  quant.(none):/ext/mysql/bkroot/mysql-5.1-new-rpl-a


sql/slave.cc:
  Auto merged
This commit is contained in:
unknown 2007-06-07 20:07:23 +02:00
commit e8638b5cf8
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sql/slave.cc
View File

@ -2015,12 +2015,13 @@ connected:
{ {
/* /*
Register ourselves with the master. 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"; thd->proc_info = "Registering slave on master";
if (register_slave_on_master(mysql) || update_slave_list(mysql, mi)) if (register_slave_on_master(mysql))
{
sql_print_error("Slave I/O thread couldn't register on master");
goto err; goto err;
}
} }
DBUG_PRINT("info",("Starting reading binary log from master")); DBUG_PRINT("info",("Starting reading binary log from master"));