MDEV-21601 : Cleanup Galera disabled tests

* Remove those tests that will not be supported on that release.
* Make sure that correct tests are disabled and have MDEVs
* Sort test names

6 files changed, 0 insertions, 122 deletions

diff --git a/mysql-test/suite/galera/r/galera_as_slave_replication_bundle.result b/mysql-test/suite/galera/r/galera_as_slave_replication_bundle.result
deleted file mode 100644
index a86bfd20e2f..00000000000
--- a/mysql-test/suite/galera/r/galera_as_slave_replication_bundle.result
+++ /dev/null
@@ -1,15 +0,0 @@
-START SLAVE USER='root';
-Warnings:
-Note	1759	Sending passwords in plain text without SSL/TLS is extremely insecure.
-CREATE TABLE t1 (f1 INTEGER PRIMARY KEY) ENGINE=InnoDB;
-INSERT INTO t1 VALUES(1);
-INSERT INTO t1 VALUES(2);
-INSERT INTO t1 VALUES(3);
-INSERT INTO t1 VALUES(4);
-INSERT INTO t1 VALUES(5);
-SELECT COUNT(*) = 4 FROM t1;
-COUNT(*) = 4
-1
-DROP TABLE t1;
-STOP SLAVE;
-RESET SLAVE ALL;
diff --git a/mysql-test/suite/galera/r/galera_v1_row_events.result b/mysql-test/suite/galera/r/galera_v1_row_events.result
deleted file mode 100644
index 80fe2fb6d8d..00000000000
--- a/mysql-test/suite/galera/r/galera_v1_row_events.result
+++ /dev/null
@@ -1,15 +0,0 @@
-connection node_2;
-connection node_1;
-CREATE TABLE t1 (f1 INT PRIMARY KEY) ENGINE=InnoDB;
-INSERT INTO t1 VALUES (1);
-connection node_2;
-SELECT COUNT(*) = 1 FROM t1;
-COUNT(*) = 1
-1
-connection node_1;
-UPDATE t1 SET f1 = 2 WHERE f1 = 1;
-connection node_2;
-SELECT COUNT(*) = 1 FROM t1 WHERE f1 = 2;
-COUNT(*) = 1
-1
-DROP TABLE t1;
diff --git a/mysql-test/suite/galera/t/galera_as_slave_replication_bundle.cnf b/mysql-test/suite/galera/t/galera_as_slave_replication_bundle.cnf
deleted file mode 100644
index d092d88bfaf..00000000000
--- a/mysql-test/suite/galera/t/galera_as_slave_replication_bundle.cnf
+++ /dev/null
@@ -1,4 +0,0 @@
-!include ../galera_2nodes_as_slave.cnf
-
-[mysqld]
-wsrep-mysql-replication-bundle=2
diff --git a/mysql-test/suite/galera/t/galera_as_slave_replication_bundle.test b/mysql-test/suite/galera/t/galera_as_slave_replication_bundle.test
deleted file mode 100644
index fa5f3f9c7c6..00000000000
--- a/mysql-test/suite/galera/t/galera_as_slave_replication_bundle.test
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# Test the wsrep_replication_bundle variable. We expect that multiple async replication events
-# will be grouped together and thus a smaller number of wsrep_last_committed transactions will
-# be reported.
-#
-
---source include/have_innodb.inc
---source include/galera_cluster.inc
-
-# As node #3 is not a Galera node, and galera_cluster.inc does not open connetion to it
-# we open the node_3 connection here
---connect node_3, 127.0.0.1, root, , test, $NODE_MYPORT_3
-
---connection node_2
---disable_query_log
---eval CHANGE MASTER TO  MASTER_HOST='127.0.0.1', MASTER_USER='root', MASTER_PORT=$NODE_MYPORT_3;
---enable_query_log
-START SLAVE;
-
---connection node_3
-CREATE TABLE t1 (f1 INTEGER PRIMARY KEY) ENGINE=InnoDB;
-INSERT INTO t1 VALUES(1);
-INSERT INTO t1 VALUES(2);
-INSERT INTO t1 VALUES(3);
-INSERT INTO t1 VALUES(4);
-INSERT INTO t1 VALUES(5);
-
---connection node_2
---let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 't1';
---source include/wait_condition.inc
-
---let $wait_condition = SELECT COUNT(*) = 4 FROM t1;
---source include/wait_condition.inc
-
-# With wsrep_mysql_replication_bundle = 2, the last insert is not delivered
-# because there are not enough events remaining to complete an entire bundle
-SELECT COUNT(*) = 4 FROM t1;
-
-# Bundle is now complete, the last INSERT and the DROP are delivered
---connection node_3
-DROP TABLE t1;
-
---connection node_2
---sleep 1
---let $wait_condition = SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 't1';
---source include/wait_condition.inc
-
-STOP SLAVE;
-RESET SLAVE ALL;
diff --git a/mysql-test/suite/galera/t/galera_flush_local.cnf b/mysql-test/suite/galera/t/galera_flush_local.cnf
deleted file mode 100644
index c92cb58f484..00000000000
--- a/mysql-test/suite/galera/t/galera_flush_local.cnf
+++ /dev/null
@@ -1,12 +0,0 @@
-!include ../galera_2nodes.cnf
-
-[mysqld.1]
-query_cache_type=1
-query_cache_size=1000000
-wsrep_replicate_myisam=ON
-
-[mysqld.2]
-query_cache_type=1
-query_cache_size=1000000
-wsrep_replicate_myisam=ON
-
diff --git a/mysql-test/suite/galera_sr/t/galera_sr_v1_row_events.test b/mysql-test/suite/galera_sr/t/galera_sr_v1_row_events.test
deleted file mode 100644
index d3d4d2d0c14..00000000000
--- a/mysql-test/suite/galera_sr/t/galera_sr_v1_row_events.test
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Test that Galera SR continues to run even with --log-bin-use-v1-row-events=1
-#
-
---source include/galera_cluster.inc
---source include/have_innodb.inc
-
-CREATE TABLE t1 (f1 INT PRIMARY KEY) ENGINE=InnoDB;
-
-SET AUTOCOMMIT=OFF;
-START TRANSACTION;
-INSERT INTO t1 VALUES (1);
-
---connection node_2
-SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
-SELECT COUNT(*) = 1 FROM t1;
-
---connection node_1
-COMMIT;
-
-SET AUTOCOMMIT=ON;
-UPDATE t1 SET f1 = 2 WHERE f1 = 1;
-
---connection node_2
-SELECT COUNT(*) = 1 FROM t1 WHERE f1 = 2;
-
-DROP TABLE t1;