diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-01 17:43:44 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-01 17:43:44 +0300 |
| commit | be51738465ff30eda627c72168e06e2ea9ca13f8 (patch) | |
| tree | 6155ed053a62a83aaf2d3c28218f4a83f878de7f | |
| parent | c36834c8324974f26770d64192898f4f45d9f772 (diff) | |
| download | mariadb-git-be51738465ff30eda627c72168e06e2ea9ca13f8.tar.gz | |
MDEV-20428 after-merge fix: Stabilize the test
| -rw-r--r-- | mysql-test/suite/rpl/r/rpl_binlog_dump_slave_gtid_state_info.result | 6 | ||||
| -rw-r--r-- | mysql-test/suite/rpl/t/rpl_binlog_dump_slave_gtid_state_info.test | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_binlog_dump_slave_gtid_state_info.result b/mysql-test/suite/rpl/r/rpl_binlog_dump_slave_gtid_state_info.result index b7f06a7dc46..98688df7273 100644 --- a/mysql-test/suite/rpl/r/rpl_binlog_dump_slave_gtid_state_info.result +++ b/mysql-test/suite/rpl/r/rpl_binlog_dump_slave_gtid_state_info.result @@ -8,7 +8,7 @@ CHANGE MASTER TO MASTER_USE_GTID=current_pos; include/start_slave.inc connection master; "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; include/stop_slave.inc CHANGE MASTER TO MASTER_USE_GTID=no; @@ -25,7 +25,7 @@ CHANGE MASTER TO MASTER_USE_GTID=slave_pos; include/start_slave.inc connection master; "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; INSERT INTO t VALUES(20); connection slave; @@ -35,7 +35,7 @@ CHANGE MASTER TO MASTER_USE_GTID=slave_pos; include/start_slave.inc 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')" -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 =====" connection slave; include/stop_slave.inc diff --git a/mysql-test/suite/rpl/t/rpl_binlog_dump_slave_gtid_state_info.test b/mysql-test/suite/rpl/t/rpl_binlog_dump_slave_gtid_state_info.test index 63d4256bc78..f26e9565671 100644 --- a/mysql-test/suite/rpl/t/rpl_binlog_dump_slave_gtid_state_info.test +++ b/mysql-test/suite/rpl/t/rpl_binlog_dump_slave_gtid_state_info.test @@ -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('')" --let SEARCH_FILE=$log_error_ --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 --connection slave @@ -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')" --let SEARCH_FILE=$log_error_ --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 SET @@SESSION.gtid_domain_id=10; INSERT INTO t VALUES(20); @@ -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')" --let SEARCH_FILE=$log_error_ --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 --echo "===== Clean up =====" |