1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
into nick.leippe.com:/home/nick/mysql/mysql
This commit is contained in:
unknown 2002-05-31 16:56:48 -07:00
commit 32113efe2a
3 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/rpl_empty_master_crash.result Normal file
View File

@ -0,0 +1,2 @@
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

8
mysql-test/t/rpl_empty_master_crash.test Normal file
View File

@ -0,0 +1,8 @@
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;

6
sql/slave.cc
View File

@ -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;