Better error messages if slave is not properly configured

Author: montywi

mysql-test/suite/rpl/r/rpl_row_reset_slave.result

@@ -47,7 +47,7 @@ include/start_slave.inc
 include/stop_slave.inc
 reset slave all;
 start slave;
-ERROR HY000: The server is not configured as slave; fix in config file or with CHANGE MASTER TO
+ERROR HY000: Misconfigured slave: MASTER_HOST was not set; Fix in config file or with CHANGE MASTER TO
 CHANGE MASTER TO MASTER_HOST= 'MASTER_HOST', MASTER_USER= 'MASTER_USER', MASTER_PORT= MASTER_PORT;
 include/start_slave.inc
 include/rpl_end.inc

mysql-test/suite/rpl/r/rpl_stm_reset_slave.result

@@ -47,7 +47,7 @@ include/start_slave.inc
 include/stop_slave.inc
 reset slave all;
 start slave;
-ERROR HY000: The server is not configured as slave; fix in config file or with CHANGE MASTER TO
+ERROR HY000: Misconfigured slave: MASTER_HOST was not set; Fix in config file or with CHANGE MASTER TO
 CHANGE MASTER TO MASTER_HOST= 'MASTER_HOST', MASTER_USER= 'MASTER_USER', MASTER_PORT= MASTER_PORT;
 include/start_slave.inc
 include/rpl_end.inc

sql/sql_repl.cc

@@ -2869,7 +2869,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
@@ -2963,8 +2975,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
  {