Commit be517384 authored by Marko Mäkelä's avatar Marko Mäkelä

MDEV-20428 after-merge fix: Stabilize the test

parent c36834c8
...@@ -8,7 +8,7 @@ CHANGE MASTER TO MASTER_USE_GTID=current_pos; ...@@ -8,7 +8,7 @@ CHANGE MASTER TO MASTER_USE_GTID=current_pos;
include/start_slave.inc include/start_slave.inc
connection master; connection master;
"Test Case 1: Start binlog_dump to slave_server(#), pos(master-bin.000001, ###), using_gtid(1), gtid('')" "Test Case 1: Start binlog_dump to slave_server(#), pos(master-bin.000001, ###), using_gtid(1), gtid('')"
FOUND 1 /using_gtid\(1\), gtid\(\'\'\)/ in mysqld.1.err FOUND 1 /using_gtid\(1\), gtid\(\'\'\).*/ in mysqld.1.err
connection slave; connection slave;
include/stop_slave.inc include/stop_slave.inc
CHANGE MASTER TO MASTER_USE_GTID=no; CHANGE MASTER TO MASTER_USE_GTID=no;
...@@ -25,7 +25,7 @@ CHANGE MASTER TO MASTER_USE_GTID=slave_pos; ...@@ -25,7 +25,7 @@ CHANGE MASTER TO MASTER_USE_GTID=slave_pos;
include/start_slave.inc include/start_slave.inc
connection master; connection master;
"Test Case 3: Start binlog_dump to slave_server(#), pos(master-bin.000001, ###), using_gtid(1), gtid('0-1-2')" "Test Case 3: Start binlog_dump to slave_server(#), pos(master-bin.000001, ###), using_gtid(1), gtid('0-1-2')"
FOUND 1 /using_gtid\(1\), gtid\(\'0-1-2\'\)/ in mysqld.1.err FOUND 1 /using_gtid\(1\), gtid\(\'0-1-2\'\).*/ in mysqld.1.err
SET @@SESSION.gtid_domain_id=10; SET @@SESSION.gtid_domain_id=10;
INSERT INTO t VALUES(20); INSERT INTO t VALUES(20);
connection slave; connection slave;
...@@ -35,7 +35,7 @@ CHANGE MASTER TO MASTER_USE_GTID=slave_pos; ...@@ -35,7 +35,7 @@ CHANGE MASTER TO MASTER_USE_GTID=slave_pos;
include/start_slave.inc include/start_slave.inc
connection master; connection master;
"Test Case 4: Start binlog_dump to slave_server(#), pos(master-bin.000001, ###), using_gtid(1), gtid('0-1-2,10-1-1')" "Test Case 4: Start binlog_dump to slave_server(#), pos(master-bin.000001, ###), using_gtid(1), gtid('0-1-2,10-1-1')"
FOUND 1 /using_gtid\(1\), gtid\(\'0-1-2,10-1-1\'\)/ in mysqld.1.err FOUND 1 /using_gtid\(1\), gtid\(\'0-1-2,10-1-1\'\).*/ in mysqld.1.err
"===== Clean up =====" "===== Clean up ====="
connection slave; connection slave;
include/stop_slave.inc include/stop_slave.inc
......
...@@ -58,7 +58,7 @@ if(!$log_error_) ...@@ -58,7 +58,7 @@ if(!$log_error_)
--echo "Test Case 1: Start binlog_dump to slave_server(#), pos(master-bin.000001, ###), using_gtid(1), gtid('')" --echo "Test Case 1: Start binlog_dump to slave_server(#), pos(master-bin.000001, ###), using_gtid(1), gtid('')"
--let SEARCH_FILE=$log_error_ --let SEARCH_FILE=$log_error_
--let SEARCH_RANGE=-50000 --let SEARCH_RANGE=-50000
--let SEARCH_PATTERN=using_gtid\(1\), gtid\(\'\'\) --let SEARCH_PATTERN=using_gtid\(1\), gtid\(\'\'\).*
--source include/search_pattern_in_file.inc --source include/search_pattern_in_file.inc
--connection slave --connection slave
...@@ -88,7 +88,7 @@ CHANGE MASTER TO MASTER_USE_GTID=slave_pos; ...@@ -88,7 +88,7 @@ CHANGE MASTER TO MASTER_USE_GTID=slave_pos;
--echo "Test Case 3: Start binlog_dump to slave_server(#), pos(master-bin.000001, ###), using_gtid(1), gtid('0-1-2')" --echo "Test Case 3: Start binlog_dump to slave_server(#), pos(master-bin.000001, ###), using_gtid(1), gtid('0-1-2')"
--let SEARCH_FILE=$log_error_ --let SEARCH_FILE=$log_error_
--let SEARCH_RANGE=-50000 --let SEARCH_RANGE=-50000
--let SEARCH_PATTERN=using_gtid\(1\), gtid\(\'0-1-2\'\) --let SEARCH_PATTERN=using_gtid\(1\), gtid\(\'0-1-2\'\).*
--source include/search_pattern_in_file.inc --source include/search_pattern_in_file.inc
SET @@SESSION.gtid_domain_id=10; SET @@SESSION.gtid_domain_id=10;
INSERT INTO t VALUES(20); INSERT INTO t VALUES(20);
...@@ -106,7 +106,7 @@ CHANGE MASTER TO MASTER_USE_GTID=slave_pos; ...@@ -106,7 +106,7 @@ CHANGE MASTER TO MASTER_USE_GTID=slave_pos;
--echo "Test Case 4: Start binlog_dump to slave_server(#), pos(master-bin.000001, ###), using_gtid(1), gtid('0-1-2,10-1-1')" --echo "Test Case 4: Start binlog_dump to slave_server(#), pos(master-bin.000001, ###), using_gtid(1), gtid('0-1-2,10-1-1')"
--let SEARCH_FILE=$log_error_ --let SEARCH_FILE=$log_error_
--let SEARCH_RANGE=-50000 --let SEARCH_RANGE=-50000
--let SEARCH_PATTERN=using_gtid\(1\), gtid\(\'0-1-2,10-1-1\'\) --let SEARCH_PATTERN=using_gtid\(1\), gtid\(\'0-1-2,10-1-1\'\).*
--source include/search_pattern_in_file.inc --source include/search_pattern_in_file.inc
--echo "===== Clean up =====" --echo "===== Clean up ====="
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment