From 0b8743c1b2da849d876887ea102c44a7ca9c1c37 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 17 Oct 2003 00:00:25 +0200 Subject: [PATCH] A fix for a random test failure rpl_trunc_binlog: don't RESET MASTER while the slave is connected. mysql-test/t/rpl_trunc_binlog.test: don't RESET MASTER while the slave is connected; this could confuse the master or slave. (In replication you don't RESET MASTER while a slave is connected!) sql/slave.cc: typo --- mysql-test/t/rpl_trunc_binlog.test | 2 -- sql/slave.cc | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/mysql-test/t/rpl_trunc_binlog.test b/mysql-test/t/rpl_trunc_binlog.test index 11ec0026560..2c34b7a442f 100644 --- a/mysql-test/t/rpl_trunc_binlog.test +++ b/mysql-test/t/rpl_trunc_binlog.test @@ -22,5 +22,3 @@ start slave; sleep 3; --replace_result $MASTER_MYPORT MASTER_PORT show slave status; -connection master; -reset master; diff --git a/sql/slave.cc b/sql/slave.cc index 9c380408291..b679ac2f6b8 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -1337,7 +1337,7 @@ file '%s', errno %d)", fname, my_errno); if (init_relay_log_pos(rli,NullS,BIN_LOG_HEADER_SIZE,0 /* no data lock */, &msg)) { - sql_print_error("Failed to open the relay log 'FIRST' (relay_log_pos 4"); + sql_print_error("Failed to open the relay log 'FIRST' (relay_log_pos 4)"); goto err; } rli->master_log_name[0]= 0;