database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Fixed bug: load table from master w/empty master would hang.

Browse Source 
Now it properly returns error.
Added respective test case.
This commit is contained in:
nick@nick.leippe.com
2002-05-30 17:31:25 -07:00
parent 7bde7e21b9
commit e62283b900
3 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -0,0 +1,12 @@
slave stop;
reset master;
reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
slave start;
use test;
drop table if exists t1;
show slave status;
Master_Host Master_User Master_Port Connect_retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space
0 0 0 0 No No 0 0 0 0
load table t1 from master;
Error in fetch_master_table

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

@@ -0,0 +1,7 @@
source include/master-slave.inc;
connection master;
use test;
drop table if exists t1;
show slave status;
--error 1218
load table t1 from master;

3
sql/repl_failsafe.cc
View File

@@ -608,6 +608,9 @@ int show_slave_hosts(THD* thd)
int connect_to_master(THD *thd, MYSQL* mysql, MASTER_INFO* mi)
{
if (!mi->host || !*mi->host) /* empty host */
return 1;
if (!mc_mysql_connect(mysql, mi->host, mi->user, mi->password, 0,
mi->port, 0, 0))
{