mirror of
https://github.com/MariaDB/server.git
synced 2026-01-06 05:22:24 +03:00
Made rpl_flushlog_loop use wait_slave_status instead of sleep.
This to save 5 seconds of test time. More test to follow. :-)
This commit is contained in:
@@ -2,10 +2,9 @@
|
||||
# in case of bi-directional replication
|
||||
-- source include/master-slave.inc
|
||||
|
||||
# This test is dependent on the actual events written to the binary
|
||||
# log. To not break statement-based testing, we only run this test
|
||||
# under statement-based logging.
|
||||
|
||||
#
|
||||
# Start replication master -> slave
|
||||
#
|
||||
connection slave;
|
||||
--disable_warnings
|
||||
stop slave;
|
||||
@@ -14,6 +13,10 @@ stop slave;
|
||||
eval change master to master_host='127.0.0.1',master_user='root',
|
||||
master_password='',master_port=$MASTER_MYPORT;
|
||||
start slave;
|
||||
|
||||
#
|
||||
# Start replication slave -> master
|
||||
#
|
||||
connection master;
|
||||
--disable_warnings
|
||||
stop slave;
|
||||
@@ -22,9 +25,23 @@ stop slave;
|
||||
eval change master to master_host='127.0.0.1',master_user='root',
|
||||
master_password='',master_port=$SLAVE_MYPORT;
|
||||
start slave;
|
||||
sleep 5;
|
||||
|
||||
#
|
||||
# Wait for start of slave IO and SQL threads
|
||||
#
|
||||
let $result_pattern= '%127.0.0.1%root%slave-bin.000001%slave-bin.000001%Yes%Yes%0%0%None%';
|
||||
--source include/wait_slave_status.inc
|
||||
|
||||
#
|
||||
# Flush logs of slave
|
||||
#
|
||||
flush logs;
|
||||
sleep 5;
|
||||
|
||||
#
|
||||
# Show status of slave
|
||||
#
|
||||
--replace_result $SLAVE_MYPORT SLAVE_PORT
|
||||
--replace_column 1 # 8 # 9 # 16 # 23 # 33 #
|
||||
show slave status;
|
||||
--vertical_results
|
||||
SHOW SLAVE STATUS;
|
||||
|
||||
Reference in New Issue
Block a user