summaryrefslogtreecommitdiff
path: root/mysql-test/suite/galera_sr
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test/suite/galera_sr')
-rw-r--r--mysql-test/suite/galera_sr/disabled.def4
-rw-r--r--mysql-test/suite/galera_sr/r/mdev_18631.result1
-rw-r--r--mysql-test/suite/galera_sr/t/galera_sr_large_fragment-master.opt2
-rw-r--r--mysql-test/suite/galera_sr/t/galera_sr_mysqldump_sst.test5
-rw-r--r--mysql-test/suite/galera_sr/t/mdev_18631.test1
5 files changed, 10 insertions, 3 deletions
diff --git a/mysql-test/suite/galera_sr/disabled.def b/mysql-test/suite/galera_sr/disabled.def
index 58b4af32300..8d13198cd0c 100644
--- a/mysql-test/suite/galera_sr/disabled.def
+++ b/mysql-test/suite/galera_sr/disabled.def
@@ -11,3 +11,7 @@
##############################################################################
GCF-1060 : MDEV-26528 wrong usage of mutex LOCK_thd_kill and LOCK_thd_kill
+
+galera_sr_ws_size2 : MDEV-29773 assertion failure
+galera-features#56 : MDEV-29773 assertion failure
+MDEV-27615 : MDEV-29773 assertion failure
diff --git a/mysql-test/suite/galera_sr/r/mdev_18631.result b/mysql-test/suite/galera_sr/r/mdev_18631.result
index bc6c0e48538..779ae5266a3 100644
--- a/mysql-test/suite/galera_sr/r/mdev_18631.result
+++ b/mysql-test/suite/galera_sr/r/mdev_18631.result
@@ -5,6 +5,7 @@ connection node_1;
CREATE TABLE t1(f1 INT PRIMARY KEY) ENGINE=INNODB;
INSERT INTO t1 VALUES (1), (2), (3);
connection node_2;
+call mtr.add_suppression("WSREP: Ignoring server id for non bootstrap node.");
SELECT * FROM t1;
f1
1
diff --git a/mysql-test/suite/galera_sr/t/galera_sr_large_fragment-master.opt b/mysql-test/suite/galera_sr/t/galera_sr_large_fragment-master.opt
index 132c6aed246..e1e4341c484 100644
--- a/mysql-test/suite/galera_sr/t/galera_sr_large_fragment-master.opt
+++ b/mysql-test/suite/galera_sr/t/galera_sr_large_fragment-master.opt
@@ -1 +1 @@
---innodb_log_file_size=1G --binlog-row-event-max-size=100M
+--innodb_log_file_size=2G --binlog-row-event-max-size=100M
diff --git a/mysql-test/suite/galera_sr/t/galera_sr_mysqldump_sst.test b/mysql-test/suite/galera_sr/t/galera_sr_mysqldump_sst.test
index e660895cde6..50378b2a9bd 100644
--- a/mysql-test/suite/galera_sr/t/galera_sr_mysqldump_sst.test
+++ b/mysql-test/suite/galera_sr/t/galera_sr_mysqldump_sst.test
@@ -10,7 +10,7 @@
# Save original auto_increment_offset values.
--let $node_1=node_1
--let $node_2=node_2
---source suite/galera/include/auto_increment_offset_save.inc
+--source ../../galera/include/auto_increment_offset_save.inc
--connection node_1
CREATE TABLE ten (f1 INTEGER);
@@ -84,4 +84,5 @@ SET SESSION wsrep_trx_fragment_size=0;
--source suite/galera/include/galera_sst_restore.inc
# Restore original auto_increment_offset values.
---source suite/galera/include/auto_increment_offset_restore.inc
+--source ../galera/include/auto_increment_offset_restore.inc
+
diff --git a/mysql-test/suite/galera_sr/t/mdev_18631.test b/mysql-test/suite/galera_sr/t/mdev_18631.test
index b6a0d85bbd4..0d1ea34c2f2 100644
--- a/mysql-test/suite/galera_sr/t/mdev_18631.test
+++ b/mysql-test/suite/galera_sr/t/mdev_18631.test
@@ -14,6 +14,7 @@ CREATE TABLE t1(f1 INT PRIMARY KEY) ENGINE=INNODB;
INSERT INTO t1 VALUES (1), (2), (3);
--connection node_2
+call mtr.add_suppression("WSREP: Ignoring server id for non bootstrap node.");
SELECT * FROM t1;
--connection node_1