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

Backport for WL#3894

Browse Source
This commit is contained in:
Serge Kozlov
2009-11-28 02:34:47 +03:00
parent 9e3b092c92
commit 11faf99c29
62 changed files with 149 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/suite/rpl/t/rpl_slave_skip.test
View File

@ -5,6 +5,7 @@ source include/have_innodb.inc;
connection slave;
source include/have_innodb.inc;
STOP SLAVE;
--source include/wait_for_slave_to_stop.inc
--echo **** On Master ****
connection master;
@ -27,7 +28,7 @@ connection slave;
# Stop when reaching the the first table map event.
START SLAVE UNTIL MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=762;
-- source include/wait_for_slave_sql_to_stop.inc
--source include/wait_for_slave_sql_to_stop.inc
--replace_result $MASTER_MYPORT MASTER_PORT
--replace_column 1 # 8 # 9 # 23 # 33 # 35 # 36 #
query_vertical SHOW SLAVE STATUS;
@ -37,6 +38,7 @@ query_vertical SHOW SLAVE STATUS;
# changed.
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1;
START SLAVE;
--source include/wait_for_slave_to_start.inc
sync_with_master;
# These values should be what was inserted, not what was
@ -47,6 +49,7 @@ SELECT * FROM t1;
SELECT * FROM t2;
STOP SLAVE;
--source include/wait_for_slave_to_stop.inc
RESET SLAVE;
connection master;
RESET MASTER;
@ -59,9 +62,10 @@ source include/show_binlog_events.inc;
connection slave;
START SLAVE UNTIL MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=106;
-- source include/wait_for_slave_sql_to_stop.inc
--source include/wait_for_slave_sql_to_stop.inc
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1;
START SLAVE;
--source include/wait_for_slave_to_start.inc
sync_with_master;
--replace_result $MASTER_MYPORT MASTER_PORT
--replace_column 1 # 8 # 9 # 23 # 33 # 35 # 36 #