Commit 5f93b1e4 authored by nick@nick.leippe.com's avatar nick@nick.leippe.com
Browse files

Merge nleippe@work.mysql.com:/home/bk/mysql 

into nick.leippe.com:/home/nick/mysql/mysql
parents e2a11641 fc52e079

mysql-test/r/rpl_empty_master_crash.result

0 → 100644
+2 −0
Original line number Diff line number Diff line 
Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter

		0	0		0	No			0		0

mysql-test/t/rpl_empty_master_crash.test

0 → 100644
+8 −0
Original line number Diff line number Diff line 
source include/master-slave.inc;

connection master;

use test;

drop table if exists t1;

show slave status;

#--error 1218 # for mysql-4.0

--error 1042

load table t1 from master;

sql/slave.cc

+6 −0
Original line number Diff line number Diff line
@@ -451,6 +451,12 @@ int fetch_nx_table(THD* thd, MASTER_INFO* mi) 
    goto err;

  }



  if (!mi->host || !*mi->host)

  {

    nx_errno = ER_BAD_HOST_ERROR;

    goto err;

  }



  safe_connect(thd, mysql, mi);

  if (slave_killed(thd))

    goto err;