diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-09-22 15:21:43 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-09-22 15:21:43 +0300 |
| commit | 9d0ee2dcb72c011b4ee73c578cc32b666297ca31 (patch) | |
| tree | 87992f23022a4fdd0e722ced5388e0fe0ea1a5e9 /mysql-test/suite/rpl/r | |
| parent | 78efa1093076307946873f322b45a14d1ed5ffb0 (diff) | |
| parent | 4c19227929b0d86616337585fb95a4bb8fe0d4b2 (diff) | |
| download | mariadb-git-9d0ee2dcb72c011b4ee73c578cc32b666297ca31.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'mysql-test/suite/rpl/r')
| -rw-r--r-- | mysql-test/suite/rpl/r/rpl_binlog_index.result | 10 | ||||
| -rw-r--r-- | mysql-test/suite/rpl/r/rpl_gtid_crash.result | 3 |
2 files changed, 13 insertions, 0 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_binlog_index.result b/mysql-test/suite/rpl/r/rpl_binlog_index.result index 4257dbde57a..78665ba1a7b 100644 --- a/mysql-test/suite/rpl/r/rpl_binlog_index.result +++ b/mysql-test/suite/rpl/r/rpl_binlog_index.result @@ -7,13 +7,20 @@ CREATE TABLE t1 (a INT); FLUSH BINARY LOGS; INSERT INTO t1 VALUES (1); connection slave; +include/stop_slave.inc connection master; # Shutdown master include/rpl_stop_server.inc [server_number=1] # Move the master binlog files and the index file to a new place # Restart master with log-bin option set to the new path # Master has restarted successfully +connection slave; +include/start_slave.inc +connection master; # Create the master-bin.index file with the old format +connection slave; +include/stop_slave.inc +connection master; # Shutdown master include/rpl_stop_server.inc [server_number=1] # Move back the master binlog files @@ -21,6 +28,9 @@ include/rpl_stop_server.inc [server_number=1] # Restart master with log-bin option set to default # Master has restarted successfully connection slave; +include/start_slave.inc +connection master; +connection slave; # stop slave include/stop_slave.inc include/rpl_stop_server.inc [server_number=2] diff --git a/mysql-test/suite/rpl/r/rpl_gtid_crash.result b/mysql-test/suite/rpl/r/rpl_gtid_crash.result index 7b6e95bf718..cb7ac8c0094 100644 --- a/mysql-test/suite/rpl/r/rpl_gtid_crash.result +++ b/mysql-test/suite/rpl/r/rpl_gtid_crash.result @@ -9,6 +9,9 @@ ALTER TABLE mysql.gtid_slave_pos ENGINE=InnoDB; CREATE TABLE t1 (a INT PRIMARY KEY, b INT) ENGINE=InnoDB; INSERT INTO t1 VALUES (1, 0); connection server_2; +SET sql_log_bin=0; +call mtr.add_suppression('Master command COM_REGISTER_SLAVE failed: failed registering on master, reconnecting to try again'); +SET sql_log_bin=1; include/stop_slave.inc CHANGE MASTER TO master_host = '127.0.0.1', master_port = MASTER_PORT, MASTER_USE_GTID=CURRENT_POS; |