mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-24 07:44:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint

Browse source 
into  mysql.com:/home/ram/work/b28772/b28772.5.1
This commit is contained in:
unknown 2007-06-21 13:26:17 +05:00
commit 5c21be54c7
6 changed files with 14 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mysql-test/include/wait_for_slave_io_to_stop.inc
View file

@ -25,7 +25,7 @@ while ($run)
sleep 0.1; sleep 0.1;
if (!$counter){ if (!$counter){
--echo "Failed while waiting for slave IO thread to stop" --echo "Failed while waiting for slave IO thread to stop"
SHOW SLAVE STATUS; query_vertical SHOW SLAVE STATUS;
exit; exit;
} }
dec $counter; dec $counter;

6
mysql-test/include/wait_for_slave_sql_to_stop.inc
View file

@ -22,9 +22,9 @@ while ($run)
} }
sleep 0.1; sleep 0.1;
if (!$counter){ if (!$counter){
--echo "Failed while waiting for slave SQL thread to stop" --echo "Failed while waiting for slave SQL thread to stop"
SHOW SLAVE STATUS; query_vertical SHOW SLAVE STATUS;
exit; exit;
} }
dec $counter; dec $counter;
} }

2
mysql-test/include/wait_for_slave_to_start.inc
View file

@ -26,7 +26,7 @@ while ($run)
sleep 0.1; sleep 0.1;
if (!$counter){ if (!$counter){
--echo "Failed while waiting for slave to start" --echo "Failed while waiting for slave to start"
SHOW SLAVE STATUS; query_vertical SHOW SLAVE STATUS;
exit; exit;
} }
dec $counter; dec $counter;

2
mysql-test/include/wait_for_slave_to_stop.inc
View file

@ -28,7 +28,7 @@ while ($run)
sleep 0.1; sleep 0.1;
if (!$counter){ if (!$counter){
--echo "Failed while waiting for slave to stop" --echo "Failed while waiting for slave to stop"
SHOW SLAVE STATUS; query_vertical SHOW SLAVE STATUS;
exit; exit;
} }
dec $counter; dec $counter;

12
mysql-test/t/rpl_row_until.test
View file

@ -27,8 +27,7 @@ drop table t2;
# try to replicate all queries until drop of t1 # try to replicate all queries until drop of t1
connection slave; connection slave;
start slave until master_log_file='master-bin.000001', master_log_pos=311; start slave until master_log_file='master-bin.000001', master_log_pos=311;
sleep 2; --source include/wait_for_slave_sql_to_stop.inc
wait_for_slave_to_stop;
# here table should be still not deleted # here table should be still not deleted
select * from t1; select * from t1;
--replace_result $MASTER_MYPORT MASTER_MYPORT --replace_result $MASTER_MYPORT MASTER_MYPORT
@ -37,18 +36,16 @@ select * from t1;
# this should fail right after start # this should fail right after start
start slave until master_log_file='master-no-such-bin.000001', master_log_pos=291; start slave until master_log_file='master-no-such-bin.000001', master_log_pos=291;
--source include/wait_for_slave_sql_to_stop.inc
# again this table should be still not deleted # again this table should be still not deleted
select * from t1; select * from t1;
sleep 2;
wait_for_slave_to_stop;
--replace_result $MASTER_MYPORT MASTER_MYPORT --replace_result $MASTER_MYPORT MASTER_MYPORT
--replace_column 1 # 9 # 11 # 23 # 33 # --replace_column 1 # 9 # 11 # 23 # 33 #
--query_vertical SHOW SLAVE STATUS; --query_vertical SHOW SLAVE STATUS;
# try replicate all up to and not including the second insert to t2; # try replicate all up to and not including the second insert to t2;
start slave until relay_log_file='slave-relay-bin.000004', relay_log_pos=728; start slave until relay_log_file='slave-relay-bin.000004', relay_log_pos=728;
sleep 2; --source include/wait_for_slave_sql_to_stop.inc
wait_for_slave_to_stop;
select * from t2; select * from t2;
--replace_result $MASTER_MYPORT MASTER_MYPORT --replace_result $MASTER_MYPORT MASTER_MYPORT
--replace_column 1 # 9 # 11 # 23 # 33 # --replace_column 1 # 9 # 11 # 23 # 33 #
@ -64,8 +61,7 @@ stop slave;
# this should stop immediately as we are already there # this should stop immediately as we are already there
start slave until master_log_file='master-bin.000001', master_log_pos=740; start slave until master_log_file='master-bin.000001', master_log_pos=740;
sleep 2; --source include/wait_for_slave_sql_to_stop.inc
wait_for_slave_to_stop;
# here the sql slave thread should be stopped # here the sql slave thread should be stopped
--replace_result $MASTER_MYPORT MASTER_MYPORT bin.000005 bin.000004 bin.000006 bin.000004 bin.000007 bin.000004 --replace_result $MASTER_MYPORT MASTER_MYPORT bin.000005 bin.000004 bin.000006 bin.000004 bin.000007 bin.000004
--replace_column 1 # 9 # 23 # 33 # --replace_column 1 # 9 # 23 # 33 #

12
mysql-test/t/rpl_stm_until.test
View file

@ -26,8 +26,7 @@ drop table t2;
# try to replicate all queries until drop of t1 # try to replicate all queries until drop of t1
connection slave; connection slave;
start slave until master_log_file='master-bin.000001', master_log_pos=323; start slave until master_log_file='master-bin.000001', master_log_pos=323;
sleep 2; --source include/wait_for_slave_sql_to_stop.inc
wait_for_slave_to_stop;
# here table should be still not deleted # here table should be still not deleted
select * from t1; select * from t1;
--replace_result $MASTER_MYPORT MASTER_MYPORT --replace_result $MASTER_MYPORT MASTER_MYPORT
@ -36,18 +35,16 @@ select * from t1;
# this should fail right after start # this should fail right after start
start slave until master_log_file='master-no-such-bin.000001', master_log_pos=291; start slave until master_log_file='master-no-such-bin.000001', master_log_pos=291;
--source include/wait_for_slave_sql_to_stop.inc
# again this table should be still not deleted # again this table should be still not deleted
select * from t1; select * from t1;
sleep 2;
wait_for_slave_to_stop;
--replace_result $MASTER_MYPORT MASTER_MYPORT --replace_result $MASTER_MYPORT MASTER_MYPORT
--replace_column 1 # 9 # 11 # 23 # 33 # --replace_column 1 # 9 # 11 # 23 # 33 #
--query_vertical SHOW SLAVE STATUS --query_vertical SHOW SLAVE STATUS
# try replicate all up to and not including the second insert to t2; # try replicate all up to and not including the second insert to t2;
start slave until relay_log_file='slave-relay-bin.000004', relay_log_pos=746; start slave until relay_log_file='slave-relay-bin.000004', relay_log_pos=746;
sleep 2; --source include/wait_for_slave_sql_to_stop.inc
wait_for_slave_to_stop;
select * from t2; select * from t2;
--replace_result $MASTER_MYPORT MASTER_MYPORT --replace_result $MASTER_MYPORT MASTER_MYPORT
--replace_column 1 # 9 # 11 # 23 # 33 # --replace_column 1 # 9 # 11 # 23 # 33 #
@ -63,8 +60,7 @@ stop slave;
# this should stop immediately as we are already there # this should stop immediately as we are already there
start slave until master_log_file='master-bin.000001', master_log_pos=776; start slave until master_log_file='master-bin.000001', master_log_pos=776;
sleep 2; --source include/wait_for_slave_sql_to_stop.inc
wait_for_slave_to_stop;
# here the sql slave thread should be stopped # here the sql slave thread should be stopped
--replace_result $MASTER_MYPORT MASTER_MYPORT bin.000005 bin.000004 bin.000006 bin.000004 bin.000007 bin.000004 --replace_result $MASTER_MYPORT MASTER_MYPORT bin.000005 bin.000004 bin.000006 bin.000004 bin.000007 bin.000004
--replace_column 1 # 9 # 23 # 33 # --replace_column 1 # 9 # 23 # 33 #