Skip to content

Commit 1c91569

Browse files
montywimontywi
committed
Set server_id to 1 by default and disallow to set it to 0
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.
1 parent e139d97 commit 1c91569

File tree

10 files changed

+24
-46
lines changed

10 files changed

+24
-46
lines changed

‎mysql-test/r/mysqld--help.result

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1339,7 +1339,7 @@ performance-schema-max-rwlock-instances -1
13391339
performance-schema-max-socket-classes 10
13401340
performance-schema-max-socket-instances -1
13411341
performance-schema-max-stage-classes 150
1342-
performance-schema-max-statement-classes 181
1342+
performance-schema-max-statement-classes 184
13431343
performance-schema-max-table-handles -1
13441344
performance-schema-max-table-instances -1
13451345
performance-schema-max-thread-classes 50
@@ -1384,7 +1384,7 @@ rowid-merge-buff-size 8388608
13841384
safe-user-create FALSE
13851385
secure-auth TRUE
13861386
secure-file-priv (No default value)
1387-
server-id 0
1387+
server-id 1
13881388
show-slave-auth-info FALSE
13891389
silent-startup FALSE
13901390
skip-grant-tables TRUE

‎mysql-test/r/variables.result

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1466,15 +1466,17 @@ SELECT @@GLOBAL.server_id;
14661466
@@GLOBAL.server_id
14671467
4294967295
14681468
SET GLOBAL server_id = 0;
1469+
Warnings:
1470+
Warning 1292 Truncated incorrect server_id value: '0'
14691471
SELECT @@GLOBAL.server_id;
14701472
@@GLOBAL.server_id
1471-
0
1473+
1
14721474
SET GLOBAL server_id = -1;
14731475
Warnings:
14741476
Warning 1292 Truncated incorrect server_id value: '-1'
14751477
SELECT @@GLOBAL.server_id;
14761478
@@GLOBAL.server_id
1477-
0
1479+
1
14781480
SET GLOBAL server_id = @old_server_id;
14791481
#
14801482
# BUG#10206 - InnoDB: Transaction requiring Max_BinLog_Cache_size > 4GB always rollsback

‎mysql-test/suite/sys_vars/r/server_id_basic.result

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,19 @@ SET @@global.server_id = 500000;
88
SET @@global.server_id = DEFAULT;
99
SELECT @@global.server_id;
1010
@@global.server_id
11-
0
11+
1
1212
'#--------------------FN_DYNVARS_144_02-------------------------#'
1313
SET @@global.server_id = DEFAULT;
14-
SELECT @@global.server_id = 0;
15-
@@global.server_id = 0
14+
SELECT @@global.server_id = 1;
15+
@@global.server_id = 1
1616
1
1717
'#--------------------FN_DYNVARS_144_03-------------------------#'
1818
SET @@global.server_id = 0;
19+
Warnings:
20+
Warning 1292 Truncated incorrect server_id value: '0'
1921
SELECT @@global.server_id;
2022
@@global.server_id
21-
0
23+
1
2224
SET @@global.server_id = 1;
2325
SELECT @@global.server_id;
2426
@@global.server_id
@@ -62,13 +64,13 @@ Warnings:
6264
Warning 1292 Truncated incorrect server_id value: '-1'
6365
SELECT @@global.server_id;
6466
@@global.server_id
65-
0
67+
1
6668
SET @@global.server_id = -2147483648;
6769
Warnings:
6870
Warning 1292 Truncated incorrect server_id value: '-2147483648'
6971
SELECT @@global.server_id;
7072
@@global.server_id
71-
0
73+
1
7274
SET @@global.server_id = 2147483649*2;
7375
Warnings:
7476
Warning 1292 Truncated incorrect server_id value: '4294967298'
@@ -102,9 +104,11 @@ SELECT @@global.server_id;
102104
@@global.server_id
103105
1
104106
SET @@global.server_id = FALSE;
107+
Warnings:
108+
Warning 1292 Truncated incorrect server_id value: '0'
105109
SELECT @@global.server_id;
106110
@@global.server_id
107-
0
111+
1
108112
'#---------------------FN_DYNVARS_001_09----------------------#'
109113
SET @@global.server_id = 512;
110114
SELECT @@server_id = @@global.server_id;

‎mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3007,9 +3007,9 @@ READ_ONLY YES
30073007
COMMAND_LINE_ARGUMENT REQUIRED
30083008
VARIABLE_NAME PERFORMANCE_SCHEMA_MAX_STATEMENT_CLASSES
30093009
SESSION_VALUE NULL
3010-
GLOBAL_VALUE 181
3010+
GLOBAL_VALUE 184
30113011
GLOBAL_VALUE_ORIGIN COMPILE-TIME
3012-
DEFAULT_VALUE 181
3012+
DEFAULT_VALUE 184
30133013
VARIABLE_SCOPE GLOBAL
30143014
VARIABLE_TYPE BIGINT UNSIGNED
30153015
VARIABLE_COMMENT Maximum number of statement instruments.
@@ -3779,11 +3779,11 @@ VARIABLE_NAME SERVER_ID
37793779
SESSION_VALUE 1
37803780
GLOBAL_VALUE 1
37813781
GLOBAL_VALUE_ORIGIN CONFIG
3782-
DEFAULT_VALUE 0
3782+
DEFAULT_VALUE 1
37833783
VARIABLE_SCOPE SESSION
37843784
VARIABLE_TYPE BIGINT UNSIGNED
37853785
VARIABLE_COMMENT Uniquely identifies the server instance in the community of replication partners
3786-
NUMERIC_MIN_VALUE 0
3786+
NUMERIC_MIN_VALUE 1
37873787
NUMERIC_MAX_VALUE 4294967295
37883788
NUMERIC_BLOCK_SIZE 1
37893789
ENUM_VALUE_LIST NULL

‎mysql-test/suite/sys_vars/t/server_id_basic.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ SELECT @@global.server_id;
5454
###################################################################
5555

5656
SET @@global.server_id = DEFAULT;
57-
SELECT @@global.server_id = 0;
57+
SELECT @@global.server_id = 1;
5858

5959
--echo '#--------------------FN_DYNVARS_144_03-------------------------#'
6060
##################################################################################

‎sql/mysqld.cc

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,6 @@ bool opt_error_log= IF_WIN(1,0);
400400
bool opt_disable_networking=0, opt_skip_show_db=0;
401401
bool opt_skip_name_resolve=0;
402402
my_bool opt_character_set_client_handshake= 1;
403-
bool server_id_supplied = 0;
404403
bool opt_endinfo, using_udf_functions;
405404
my_bool locked_in_memory;
406405
bool opt_using_transactions;
@@ -5831,17 +5830,6 @@ int mysqld_main(int argc, char **argv)
58315830
if (WSREP_ON && wsrep_check_opts())
58325831
global_system_variables.wsrep_on= 0;
58335832

5834-
if (opt_bin_log && !global_system_variables.server_id)
5835-
{
5836-
SYSVAR_AUTOSIZE(global_system_variables.server_id, ::server_id= 1);
5837-
#ifdef EXTRA_DEBUG
5838-
sql_print_warning("You have enabled the binary log, but you haven't set "
5839-
"server-id to a non-zero value: we force server id to 1; "
5840-
"updates will be logged to the binary log, but "
5841-
"connections from slaves will not be accepted.");
5842-
#endif
5843-
}
5844-
58455833
/*
58465834
The subsequent calls may take a long time : e.g. innodb log read.
58475835
Thus set the long running service control manager timeout
@@ -8707,7 +8695,6 @@ static int mysql_init_variables(void)
87078695
mqh_used= 0;
87088696
kill_in_progress= 0;
87098697
cleanup_done= 0;
8710-
server_id_supplied= 0;
87118698
test_flags= select_errors= dropping_tables= ha_open_options=0;
87128699
thread_count= thread_running= kill_cached_threads= wake_thread= 0;
87138700
service_thread_count= 0;
@@ -9176,7 +9163,6 @@ mysqld_get_one_option(int optid, const struct my_option *opt, char *argument)
91769163
opt_noacl=opt_bootstrap=1;
91779164
break;
91789165
case OPT_SERVER_ID:
9179-
server_id_supplied = 1;
91809166
::server_id= global_system_variables.server_id;
91819167
break;
91829168
case OPT_LOWER_CASE_TABLE_NAMES:

‎sql/mysqld.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ extern CHARSET_INFO *error_message_charset_info;
107107
extern CHARSET_INFO *character_set_filesystem;
108108

109109
extern MY_BITMAP temp_pool;
110-
extern bool opt_large_files, server_id_supplied;
110+
extern bool opt_large_files;
111111
extern bool opt_update_log, opt_bin_log, opt_error_log;
112112
extern my_bool opt_log, opt_bootstrap;
113113
extern my_bool opt_backup_history_log;

‎sql/sql_repl.cc

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2116,12 +2116,6 @@ static int init_binlog_sender(binlog_send_info *info,
21162116
info->error= ER_MASTER_FATAL_ERROR_READING_BINLOG;
21172117
return 1;
21182118
}
2119-
if (!server_id_supplied)
2120-
{
2121-
info->errmsg= "Misconfigured master - server id was not set";
2122-
info->error= ER_MASTER_FATAL_ERROR_READING_BINLOG;
2123-
return 1;
2124-
}
21252119

21262120
char search_file_name[FN_REFLEN];
21272121
const char *name=search_file_name;
@@ -3072,12 +3066,6 @@ int start_slave(THD* thd , Master_info* mi, bool net_report)
30723066
if (init_master_info(mi,master_info_file_tmp,relay_log_info_file_tmp, 0,
30733067
thread_mask))
30743068
slave_errno=ER_MASTER_INFO;
3075-
else if (!server_id_supplied)
3076-
{
3077-
slave_errno= ER_BAD_SLAVE; net_report= 0;
3078-
my_message(slave_errno, "Misconfigured slave: server_id was not set; Fix in config file",
3079-
MYF(0));
3080-
}
30813069
else if (!*mi->host)
30823070
{
30833071
slave_errno= ER_BAD_SLAVE; net_report= 0;

‎sql/sql_repl.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ struct slave_connection_state;
3636

3737
extern my_bool opt_show_slave_auth_info;
3838
extern char *master_host, *master_info_file;
39-
extern bool server_id_supplied;
4039

4140
extern int max_binlog_dump_events;
4241
extern my_bool opt_sporadic_binlog_dump_fail;

‎sql/sys_vars.cc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2850,7 +2850,6 @@ static bool fix_server_id(sys_var *self, THD *thd, enum_var_type type)
28502850
{
28512851
if (type == OPT_GLOBAL)
28522852
{
2853-
server_id_supplied = 1;
28542853
thd->variables.server_id= global_system_variables.server_id;
28552854
/*
28562855
Historically, server_id was a global variable that is exported to
@@ -2867,7 +2866,7 @@ static Sys_var_ulong Sys_server_id(
28672866
"Uniquely identifies the server instance in the community of "
28682867
"replication partners",
28692868
SESSION_VAR(server_id), CMD_LINE(REQUIRED_ARG, OPT_SERVER_ID),
2870-
VALID_RANGE(0, UINT_MAX32), DEFAULT(0), BLOCK_SIZE(1), NO_MUTEX_GUARD,
2869+
VALID_RANGE(1, UINT_MAX32), DEFAULT(1), BLOCK_SIZE(1), NO_MUTEX_GUARD,
28712870
NOT_IN_BINLOG, ON_CHECK(check_has_super), ON_UPDATE(fix_server_id));
28722871

28732872
static Sys_var_mybool Sys_slave_compressed_protocol(

0 commit comments

Comments
 (0)