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

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

Browse Source 
into mysql.com:/home/mydev/mysql-4.0-bug2831
This commit is contained in:
ingo@mysql.com
2004-05-10 12:36:09 +02:00
parent dd9a517e53 309c7412f6
commit 4bb5c83a62
6 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,7 +11,7 @@ show slave status;
change master to master_host='127.0.0.1'; change master to master_host='127.0.0.1';
# The following needs to be cleaned up when change master is fixed # 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; show slave status;
--replace_result $MASTER_MYPORT MASTER_PORT --replace_result $MASTER_MYPORT MASTER_PORT
eval change master to master_host='127.0.0.1',master_user='root', eval change master to master_host='127.0.0.1',master_user='root',

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

@ -14,7 +14,7 @@ connection slave;
sync_with_master; sync_with_master;
# The port number is different when doing the release build with # The port number is different when doing the release build with
# Do-compile, hence we have to replace the port number here accordingly # 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; show slave status;
# check that the table has been ignored, because otherwise the test is nonsense # check that the table has been ignored, because otherwise the test is nonsense
show tables like 't1'; show tables like 't1';

6
mysql-test/t/rpl_log.test
View File

@ -79,11 +79,11 @@ connection slave;
slave start; slave start;
sync_with_master; sync_with_master;
show master logs; 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; 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; 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; show slave status;
# Need to recode the following # Need to recode the following

8
mysql-test/t/rpl_log_pos.test
View File

@ -6,7 +6,7 @@ show master status;
save_master_pos; save_master_pos;
connection slave; connection slave;
sync_with_master; 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; show slave status;
slave stop; slave stop;
change master to master_log_pos=73; change master to master_log_pos=73;
@ -15,17 +15,17 @@ sleep 5;
slave stop; slave stop;
change master to master_log_pos=73; 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; show slave status;
slave start; slave start;
sleep 5; 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; show slave status;
slave stop; slave stop;
change master to master_log_pos=173; change master to master_log_pos=173;
slave start; slave start;
sleep 2; 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; show slave status;
connection master; connection master;
show master status; show master status;

12
mysql-test/t/rpl_max_relay_size.test
View File

@ -28,7 +28,7 @@ set global max_relay_log_size=8192-1; # mapped to 4096
select @@global.max_relay_log_size; select @@global.max_relay_log_size;
start slave; start slave;
sync_with_master; sync_with_master;
--replace_result $MASTER_MYPORT MASTER_PORT 3306 MASTER_PORT 3334 MASTER_PORT --replace_result $MASTER_MYPORT MASTER_PORT
show slave status; show slave status;
stop slave; stop slave;
reset slave; reset slave;
@ -36,7 +36,7 @@ set global max_relay_log_size=(5*4096);
select @@global.max_relay_log_size; select @@global.max_relay_log_size;
start slave; start slave;
sync_with_master; sync_with_master;
--replace_result $MASTER_MYPORT MASTER_PORT 3306 MASTER_PORT 3334 MASTER_PORT --replace_result $MASTER_MYPORT MASTER_PORT
--replace_column 18 # --replace_column 18 #
show slave status; show slave status;
stop slave; stop slave;
@ -45,7 +45,7 @@ set global max_relay_log_size=0;
select @@global.max_relay_log_size; select @@global.max_relay_log_size;
start slave; start slave;
sync_with_master; sync_with_master;
--replace_result $MASTER_MYPORT MASTER_PORT 3306 MASTER_PORT 3334 MASTER_PORT --replace_result $MASTER_MYPORT MASTER_PORT
show slave status; show slave status;
# Tests below are mainly to ensure that we have not coded with wrong assumptions # 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 # test of relay log rotation when the slave is stopped
# (to make sure it does not crash). # (to make sure it does not crash).
flush logs; flush logs;
--replace_result $MASTER_MYPORT MASTER_PORT 3306 MASTER_PORT 3334 MASTER_PORT --replace_result $MASTER_MYPORT MASTER_PORT
show slave status; show slave status;
reset slave; reset slave;
@ -70,7 +70,7 @@ create table t1 (a int);
save_master_pos; save_master_pos;
connection slave; connection slave;
sync_with_master; sync_with_master;
--replace_result $MASTER_MYPORT MASTER_PORT 3306 MASTER_PORT 3334 MASTER_PORT --replace_result $MASTER_MYPORT MASTER_PORT
show slave status; show slave status;
# one more rotation, to be sure Relay_log_space is correctly updated # one more rotation, to be sure Relay_log_space is correctly updated
flush logs; flush logs;
@ -79,7 +79,7 @@ drop table t1;
save_master_pos; save_master_pos;
connection slave; connection slave;
sync_with_master; sync_with_master;
--replace_result $MASTER_MYPORT MASTER_PORT 3306 MASTER_PORT 3334 MASTER_PORT --replace_result $MASTER_MYPORT MASTER_PORT
show slave status; show slave status;
connection master; connection master;

10
mysql-test/t/rpl_rotate_logs.test
View File

@ -25,13 +25,13 @@ system chmod 600 var/slave-data/master.info;
# init_strvar_from_file() in init_master_info()). # init_strvar_from_file() in init_master_info()).
--error 1201 --error 1201
slave start; slave start;
--replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT --replace_result $MASTER_MYPORT MASTER_PORT
# CHANGE MASTER will fail because it first parses master.info before changing it # CHANGE MASTER will fail because it first parses master.info before changing it
# (so when master.info is bad, people have to use RESET SLAVE first). # (so when master.info is bad, people have to use RESET SLAVE first).
--error 1201 --error 1201
eval change master to master_host='127.0.0.1',master_port=$MASTER_MYPORT, master_user='root'; eval change master to master_host='127.0.0.1',master_port=$MASTER_MYPORT, master_user='root';
reset slave; reset slave;
--replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT --replace_result $MASTER_MYPORT MASTER_PORT
eval change master to master_host='127.0.0.1',master_port=$MASTER_MYPORT, master_user='root'; eval change master to master_host='127.0.0.1',master_port=$MASTER_MYPORT, master_user='root';
connection master; connection master;
reset master; reset master;
@ -49,7 +49,7 @@ insert into t1 values('Could not break slave'),('Tried hard');
save_master_pos; save_master_pos;
connection slave; connection slave;
sync_with_master; sync_with_master;
--replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT --replace_result $MASTER_MYPORT MASTER_PORT
--replace_column 18 # --replace_column 18 #
show slave status; show slave status;
select * from t1; select * from t1;
@ -101,7 +101,7 @@ insert into t2 values (65);
save_master_pos; save_master_pos;
connection slave; connection slave;
sync_with_master; sync_with_master;
--replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT --replace_result $MASTER_MYPORT MASTER_PORT
--replace_column 18 # --replace_column 18 #
show slave status; show slave status;
select * from t2; select * from t2;
@ -133,7 +133,7 @@ connection slave;
sync_with_master; sync_with_master;
select * from t4; select * from t4;
--replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT --replace_result $MASTER_MYPORT MASTER_PORT
--replace_column 18 # --replace_column 18 #
show slave status; show slave status;
# because of concurrent insert, the table may not be up to date # because of concurrent insert, the table may not be up to date