database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Very small fixes for testsuite (a real_sleep instead of sleep, plus TCP port independency of the result file).

Browse Source
This commit is contained in:
guilhem@mysql.com
2004-04-28 23:43:46 +02:00
parent e7fbd33acc
commit eff7b259e3
5 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/rpl_server_id1.result
View File

@ -8,7 +8,7 @@ drop table if exists t1;
create table t1 (n int); create table t1 (n int);
reset master; reset master;
stop slave; stop slave;
change master to master_port=9307; change master to master_port=SLAVE_PORT;
show slave status; 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 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 # 127.0.0.1 root SLAVE_PORT 1 4 slave-relay-bin.001 4 No No 0 0 0 #

2
mysql-test/r/rpl_server_id2.result
View File

@ -8,7 +8,7 @@ drop table if exists t1;
create table t1 (n int); create table t1 (n int);
reset master; reset master;
stop slave; stop slave;
change master to master_port=9307; change master to master_port=SLAVE_PORT;
show slave status; 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 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 # 127.0.0.1 root SLAVE_PORT 1 4 slave-relay-bin.001 4 No No 0 0 0 #

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

@ -39,7 +39,7 @@ insert into t3 values(connection_id());
send update t2 set a = a + 1 + get_lock('crash_lock%20C', 10); send update t2 set a = a + 1 + get_lock('crash_lock%20C', 10);
connection master1; connection master1;
sleep 2; real_sleep 2;
select (@id := id) - id from t3; select (@id := id) - id from t3;
kill @id; kill @id;
drop table t2,t3; drop table t2,t3;

1
mysql-test/t/rpl_server_id1.test
View File

@ -8,6 +8,7 @@ create table t1 (n int);
reset master; reset master;
# replicate ourselves # replicate ourselves
stop slave; stop slave;
--replace_result $SLAVE_MYPORT SLAVE_PORT
eval change master to master_port=$SLAVE_MYPORT; eval change master to master_port=$SLAVE_MYPORT;
--replace_result $SLAVE_MYPORT SLAVE_PORT --replace_result $SLAVE_MYPORT SLAVE_PORT
--replace_column 18 # --replace_column 18 #

1
mysql-test/t/rpl_server_id2.test
View File

@ -8,6 +8,7 @@ create table t1 (n int);
reset master; reset master;
# replicate ourselves # replicate ourselves
stop slave; stop slave;
--replace_result $SLAVE_MYPORT SLAVE_PORT
eval change master to master_port=$SLAVE_MYPORT; eval change master to master_port=$SLAVE_MYPORT;
--replace_result $SLAVE_MYPORT SLAVE_PORT --replace_result $SLAVE_MYPORT SLAVE_PORT
--replace_column 18 # --replace_column 18 #