Commit 108f2ccb authored by monty@mashka.mysql.fi's avatar monty@mashka.mysql.fi
Browse files

Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0

parents 7b49f632 27602132

mysql-test/r/rpl_flush_log_loop.result

+3 −3
Original line number Diff line number Diff line
@@ -5,13 +5,13 @@ reset slave; 
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

slave start;

change master to master_host='127.0.0.1',master_user='root',

master_password='',master_port=9306;

master_password='',master_port=MASTER_PORT;

slave start;

slave stop;

change master to master_host='127.0.0.1',master_user='root',

master_password='',master_port=9307;

master_password='',master_port=SLAVE_PORT;

slave start;

flush logs;

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

127.0.0.1	root	9307	60	slave-bin.001	79	relay-log.001	119	slave-bin.001	Yes	Yes			0		0	79	119
 
127.0.0.1	root	SLAVE_PORT	60	slave-bin.001	79	relay-log.001	119	slave-bin.001	Yes	Yes			0		0	79	119

mysql-test/t/rpl_flush_log_loop.test

+3 −0
Original line number Diff line number Diff line
@@ -4,14 +4,17 @@ 
source include/master-slave.inc



connection slave;

--replace_result $MASTER_MYPORT MASTER_PORT

eval change master to master_host='127.0.0.1',master_user='root',

 master_password='',master_port=$MASTER_MYPORT;

slave start;

connection master;

slave stop;

--replace_result $SLAVE_MYPORT SLAVE_PORT

eval change master to master_host='127.0.0.1',master_user='root',

 master_password='',master_port=$SLAVE_MYPORT;

slave start;

flush logs;

sleep 5;

--replace_result $SLAVE_MYPORT SLAVE_PORT

show slave status;