Commit c008eb04 authored by unknown's avatar unknown
Browse files

Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 

into mysql.com:/home/mysql_src/mysql-4.0
parents d30a350d 2a5d6bdc

mysql-test/r/rpl_server_id1.result

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ drop table if exists t1; 
create table t1 (n int);

reset master;

stop slave;

change master to master_port=9307;

change master to master_port=SLAVE_PORT;

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	SLAVE_PORT	1		4	slave-relay-bin.001	4		No	No			0		0	0	#

mysql-test/r/rpl_server_id2.result

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ drop table if exists t1; 
create table t1 (n int);

reset master;

stop slave;

change master to master_port=9307;

change master to master_port=SLAVE_PORT;

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	SLAVE_PORT	1		4	slave-relay-bin.001	4		No	No			0		0	0	#

mysql-test/t/rpl_error_ignored_table.test

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ insert into t3 values(connection_id()); 
send update t2 set a = a + 1 + get_lock('crash_lock%20C', 10);



connection master1;

sleep 2;

real_sleep 2;

select (@id := id) - id from t3;

kill @id;

drop table t2,t3;

mysql-test/t/rpl_server_id1.test

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ create table t1 (n int); 
reset master;

# replicate ourselves

stop slave;

--replace_result $SLAVE_MYPORT SLAVE_PORT

eval change master to master_port=$SLAVE_MYPORT;

--replace_result $SLAVE_MYPORT SLAVE_PORT

--replace_column 18 #

mysql-test/t/rpl_server_id2.test

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ create table t1 (n int); 
reset master;

# replicate ourselves

stop slave;

--replace_result $SLAVE_MYPORT SLAVE_PORT

eval change master to master_port=$SLAVE_MYPORT;

--replace_result $SLAVE_MYPORT SLAVE_PORT

--replace_column 18 #