database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Set server_id to 1 by default and disallow to set it to 0

Browse Source 
This makes it easier to setup master as on only have to set --log-bin.
Before this patch if one did set up the master with just --log-bin, slaves
could not connect until server_id was set on the master, which could be
both confusing and hard to do.
This commit is contained in:
Monty
2016-08-29 20:28:06 +03:00
parent e139d971ec
commit 1c91569274
10 changed files with 24 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sql/sql_repl.cc
View File

@ -2116,12 +2116,6 @@ static int init_binlog_sender(binlog_send_info *info,
info->error= ER_MASTER_FATAL_ERROR_READING_BINLOG;
return 1;
}
if (!server_id_supplied)
{
info->errmsg= "Misconfigured master - server id was not set";
info->error= ER_MASTER_FATAL_ERROR_READING_BINLOG;
return 1;
}
char search_file_name[FN_REFLEN];
const char *name=search_file_name;
@ -3072,12 +3066,6 @@ int start_slave(THD* thd , Master_info* mi, bool net_report)
if (init_master_info(mi,master_info_file_tmp,relay_log_info_file_tmp, 0,
thread_mask))
slave_errno=ER_MASTER_INFO;
else if (!server_id_supplied)
{
slave_errno= ER_BAD_SLAVE; net_report= 0;
my_message(slave_errno, "Misconfigured slave: server_id was not set; Fix in config file",
MYF(0));
}
else if (!*mi->host)
{
slave_errno= ER_BAD_SLAVE; net_report= 0;