Commit 41545954 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/mydev/mysql-4.0 

into mysql.com:/home/mydev/mysql-4.0-bug2831
parents bd4be3f1 3f46a5fd

mysql-test/t/rpl000015.test

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ show slave status; 


change master to master_host='127.0.0.1';

# The following needs to be cleaned up when change master is fixed

--replace_result $MASTER_MYPORT MASTER_PORT 3306 MASTER_PORT 3334 MASTER_PORT

--replace_result $MASTER_MYPORT MASTER_PORT 3306 MASTER_PORT

show slave status;

--replace_result $MASTER_MYPORT MASTER_PORT

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

mysql-test/t/rpl_error_ignored_table.test

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ connection slave; 
sync_with_master;

# The port number is different when doing the release build with

# Do-compile, hence we have to replace the port number here accordingly

--replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT

--replace_result $MASTER_MYPORT MASTER_PORT

show slave status;

# check that the table has been ignored, because otherwise the test is nonsense

show tables like 't1';

mysql-test/t/rpl_log.test

+3 −3
Original line number Diff line number Diff line
@@ -79,11 +79,11 @@ connection slave; 
slave start;

sync_with_master;

show master logs;

--replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT $VERSION VERSION

--replace_result $MASTER_MYPORT MASTER_PORT $VERSION VERSION

show binlog events in 'slave-bin.001' from 4;

--replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT $VERSION VERSION

--replace_result $MASTER_MYPORT MASTER_PORT $VERSION VERSION

show binlog events in 'slave-bin.002' from 4;

--replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT

--replace_result $MASTER_MYPORT MASTER_PORT

show slave status;



# Need to recode the following

mysql-test/t/rpl_log_pos.test

+4 −4
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ show master status; 
save_master_pos;

connection slave;

sync_with_master;

--replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT

--replace_result $MASTER_MYPORT MASTER_PORT

show slave status;

slave stop;

change master to master_log_pos=73;
@@ -15,17 +15,17 @@ sleep 5; 
slave stop;



change master to master_log_pos=73;

--replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT

--replace_result $MASTER_MYPORT MASTER_PORT

show slave status;

slave start;

sleep 5;

--replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT

--replace_result $MASTER_MYPORT MASTER_PORT

show slave status;

slave stop;

change master to master_log_pos=173;

slave start;

sleep 2;

--replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT

--replace_result $MASTER_MYPORT MASTER_PORT

show slave status;

connection master;

show master status;

mysql-test/t/rpl_max_relay_size.test

+6 −6
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ set global max_relay_log_size=8192-1; # mapped to 4096 
select @@global.max_relay_log_size;

start slave;

sync_with_master;

--replace_result $MASTER_MYPORT MASTER_PORT 3306 MASTER_PORT 3334 MASTER_PORT

--replace_result $MASTER_MYPORT MASTER_PORT

show slave status;

stop slave;

reset slave;
@@ -36,7 +36,7 @@ set global max_relay_log_size=(5*4096); 
select @@global.max_relay_log_size;

start slave;

sync_with_master;

--replace_result $MASTER_MYPORT MASTER_PORT 3306 MASTER_PORT 3334 MASTER_PORT

--replace_result $MASTER_MYPORT MASTER_PORT

--replace_column 18 #

show slave status;

stop slave;
@@ -45,7 +45,7 @@ set global max_relay_log_size=0; 
select @@global.max_relay_log_size;

start slave;

sync_with_master;

--replace_result $MASTER_MYPORT MASTER_PORT 3306 MASTER_PORT 3334 MASTER_PORT

--replace_result $MASTER_MYPORT MASTER_PORT

show slave status;



# Tests below are mainly to ensure that we have not coded with wrong assumptions
@@ -55,7 +55,7 @@ reset slave; 
# test of relay log rotation when the slave is stopped

# (to make sure it does not crash).

flush logs;

--replace_result $MASTER_MYPORT MASTER_PORT 3306 MASTER_PORT 3334 MASTER_PORT

--replace_result $MASTER_MYPORT MASTER_PORT

show slave status;



reset slave;
@@ -70,7 +70,7 @@ create table t1 (a int); 
save_master_pos;

connection slave;

sync_with_master;

--replace_result $MASTER_MYPORT MASTER_PORT 3306 MASTER_PORT 3334 MASTER_PORT

--replace_result $MASTER_MYPORT MASTER_PORT

show slave status;

# one more rotation, to be sure Relay_log_space is correctly updated

flush logs;
@@ -79,7 +79,7 @@ drop table t1; 
save_master_pos;

connection slave;

sync_with_master;

--replace_result $MASTER_MYPORT MASTER_PORT 3306 MASTER_PORT 3334 MASTER_PORT

--replace_result $MASTER_MYPORT MASTER_PORT

show slave status;



connection master;