database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

A fix for a random test failure rpl_trunc_binlog: don't RESET MASTER

Browse Source 
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
This commit is contained in:
unknown
2003-10-17 00:00:25 +02:00
parent 1b6cffff79
commit 0b8743c1b2
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/t/rpl_trunc_binlog.test
View File

@ -22,5 +22,3 @@ start slave;
sleep 3; sleep 3;
--replace_result $MASTER_MYPORT MASTER_PORT --replace_result $MASTER_MYPORT MASTER_PORT
show slave status; show slave status;
connection master;
reset master;

2
sql/slave.cc
View File

@ -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 */, if (init_relay_log_pos(rli,NullS,BIN_LOG_HEADER_SIZE,0 /* no data lock */,
&msg)) &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; goto err;
} }
rli->master_log_name[0]= 0; rli->master_log_name[0]= 0;