diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-10-12 00:37:58 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-10-12 00:37:58 +0200 |
| commit | dfb74dea300f83880c11600dc726a9cae559f356 (patch) | |
| tree | 76da0d6e23f188bc13520bf80496e9053f227d9a /sql/sql_repl.cc | |
| parent | b785857d00a0fd9c98cb52823357bfad8fb18289 (diff) | |
| parent | e7cb032e560e14865941ecdcb553cd3aba856b68 (diff) | |
| download | mariadb-git-dfb74dea300f83880c11600dc726a9cae559f356.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'sql/sql_repl.cc')
| -rw-r--r-- | sql/sql_repl.cc | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index 5cf55d89d3e..86e8febc1f4 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -3075,7 +3075,19 @@ 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 && *mi->host) + 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; + my_message(slave_errno, "Misconfigured slave: MASTER_HOST was not set; Fix in config file or with CHANGE MASTER TO", + MYF(0)); + } + else { /* If we will start SQL thread we will care about UNTIL options If @@ -3169,8 +3181,6 @@ int start_slave(THD* thd , Master_info* mi, bool net_report) relay_log_info_file_tmp, thread_mask); } - else - slave_errno = ER_BAD_SLAVE; } else { @@ -3519,7 +3529,8 @@ bool change_master(THD* thd, Master_info* mi, bool *master_info_added) *master_info_added= true; } if (global_system_variables.log_warnings > 1) - sql_print_information("Master: '%.*s' Master_info_file: '%s' " + sql_print_information("Master connection name: '%.*s' " + "Master_info_file: '%s' " "Relay_info_file: '%s'", (int) mi->connection_name.length, mi->connection_name.str, |