summaryrefslogtreecommitdiff
path: root/mysql-test/suite/galera_sr
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2022-05-18 01:47:48 +0200
committerSergei Golubchik <serg@mariadb.org>2022-05-18 09:50:26 +0200
commit7970ac7fe87d1da34e3e212dccd57b112b94b3fe (patch)
tree4efda64ba55c4934469f61bda2013f92545dce1b /mysql-test/suite/galera_sr
parentb03ab1270d24c1fe011aa50f9e6b495c6d508706 (diff)
parent23ddc3518f999e003d54f7a069b63b73585588aa (diff)
downloadmariadb-git-7970ac7fe87d1da34e3e212dccd57b112b94b3fe.tar.gz
Merge branch '10.4' into 10.5mariadb-10.5.16
Diffstat (limited to 'mysql-test/suite/galera_sr')
-rw-r--r--mysql-test/suite/galera_sr/r/galera_sr_shutdown_slave.result2
-rw-r--r--mysql-test/suite/galera_sr/t/galera_sr_shutdown_slave.test2
2 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/suite/galera_sr/r/galera_sr_shutdown_slave.result b/mysql-test/suite/galera_sr/r/galera_sr_shutdown_slave.result
index 902aa27d5aa..34995d35a4f 100644
--- a/mysql-test/suite/galera_sr/r/galera_sr_shutdown_slave.result
+++ b/mysql-test/suite/galera_sr/r/galera_sr_shutdown_slave.result
@@ -2,6 +2,8 @@ connection node_2;
connection node_1;
connection node_1;
connection node_2;
+connection node_2;
+call mtr.add_suppression("WSREP: Failed to scan the last segment to the end. Last events may be missing. Last recovered event:.*");
connection node_1;
CREATE TABLE t1 (f1 INTEGER PRIMARY KEY) ENGINE = InnoDB;
connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1;
diff --git a/mysql-test/suite/galera_sr/t/galera_sr_shutdown_slave.test b/mysql-test/suite/galera_sr/t/galera_sr_shutdown_slave.test
index d1b0d4b8c88..5d4a58b2d03 100644
--- a/mysql-test/suite/galera_sr/t/galera_sr_shutdown_slave.test
+++ b/mysql-test/suite/galera_sr/t/galera_sr_shutdown_slave.test
@@ -8,6 +8,8 @@
--let $node_1=node_1
--let $node_2=node_2
--source ../galera/include/auto_increment_offset_save.inc
+--connection node_2
+call mtr.add_suppression("WSREP: Failed to scan the last segment to the end. Last events may be missing. Last recovered event:.*");
--connection node_1
CREATE TABLE t1 (f1 INTEGER PRIMARY KEY) ENGINE = InnoDB;