Fixed dependency checking in some Galera tests + remove duplicates

mysql-test/suite/galera/r/galera_ist_innodb_flush_logs,release.rdiff

---- galera_ist_innodb_flush_logs.result
-+++ galera_ist_innodb_flush_logs,release.result
-@@ -94,111 +94,3 @@
- DROP TABLE t1;
- COMMIT;
- SET AUTOCOMMIT=ON;
--Performing State Transfer on a server that has been killed and restarted
--while a DDL was in progress on it
--connection node_1;
--CREATE TABLE t1 (f1 CHAR(255)) ENGINE=InnoDB;
--SET AUTOCOMMIT=OFF;
--START TRANSACTION;
--INSERT INTO t1 VALUES ('node1_committed_before');
--INSERT INTO t1 VALUES ('node1_committed_before');
--INSERT INTO t1 VALUES ('node1_committed_before');
--INSERT INTO t1 VALUES ('node1_committed_before');
--INSERT INTO t1 VALUES ('node1_committed_before');
--connection node_2;
--START TRANSACTION;
--INSERT INTO t1 VALUES ('node2_committed_before');
--INSERT INTO t1 VALUES ('node2_committed_before');
--INSERT INTO t1 VALUES ('node2_committed_before');
--INSERT INTO t1 VALUES ('node2_committed_before');
--INSERT INTO t1 VALUES ('node2_committed_before');
--COMMIT;
--SET GLOBAL debug_dbug = 'd,sync.alter_opened_table';
--connection node_1;
--ALTER TABLE t1 ADD COLUMN f2 INTEGER;
--connection node_2;
--SET wsrep_sync_wait = 0;
--Killing server ...
--connection node_1;
--SET AUTOCOMMIT=OFF;
--START TRANSACTION;
--INSERT INTO t1 (f1) VALUES ('node1_committed_during');
--INSERT INTO t1 (f1) VALUES ('node1_committed_during');
--INSERT INTO t1 (f1) VALUES ('node1_committed_during');
--INSERT INTO t1 (f1) VALUES ('node1_committed_during');
--INSERT INTO t1 (f1) VALUES ('node1_committed_during');
--COMMIT;
--START TRANSACTION;
--INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after');
--INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after');
--INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after');
--INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after');
--INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after');
--connect node_1a_galera_st_kill_slave_ddl, 127.0.0.1, root, , test, $NODE_MYPORT_1;
--SET AUTOCOMMIT=OFF;
--START TRANSACTION;
--INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after');
--INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after');
--INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after');
--INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after');
--INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after');
--connection node_2;
--Performing --wsrep-recover ...
--connection node_2;
--Starting server ...
--Using --wsrep-start-position when starting mysqld ...
--SET AUTOCOMMIT=OFF;
--START TRANSACTION;
--INSERT INTO t1 (f1) VALUES ('node2_committed_after');
--INSERT INTO t1 (f1) VALUES ('node2_committed_after');
--INSERT INTO t1 (f1) VALUES ('node2_committed_after');
--INSERT INTO t1 (f1) VALUES ('node2_committed_after');
--INSERT INTO t1 (f1) VALUES ('node2_committed_after');
--COMMIT;
--connection node_1;
--INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after');
--INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after');
--INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after');
--INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after');
--INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after');
--COMMIT;
--SET AUTOCOMMIT=OFF;
--START TRANSACTION;
--INSERT INTO t1 (f1) VALUES ('node1_committed_after');
--INSERT INTO t1 (f1) VALUES ('node1_committed_after');
--INSERT INTO t1 (f1) VALUES ('node1_committed_after');
--INSERT INTO t1 (f1) VALUES ('node1_committed_after');
--INSERT INTO t1 (f1) VALUES ('node1_committed_after');
--COMMIT;
--connection node_1a_galera_st_kill_slave_ddl;
--INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after');
--INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after');
--INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after');
--INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after');
--INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after');
--ROLLBACK;
--SELECT COUNT(*) = 2 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 't1';
--COUNT(*) = 2
--1
--SELECT COUNT(*) = 35 FROM t1;
--COUNT(*) = 35
--1
--SELECT COUNT(*) = 0 FROM (SELECT COUNT(*) AS c, f1 FROM t1 GROUP BY f1 HAVING c NOT IN (5, 10)) AS a1;
--COUNT(*) = 0
--1
--COMMIT;
--SET AUTOCOMMIT=ON;
--connection node_1;
--SELECT COUNT(*) = 2 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 't1';
--COUNT(*) = 2
--1
--SELECT COUNT(*) = 35 FROM t1;
--COUNT(*) = 35
--1
--SELECT COUNT(*) = 0 FROM (SELECT COUNT(*) AS c, f1 FROM t1 GROUP BY f1 HAVING c NOT IN (5, 10)) AS a1;
--COUNT(*) = 0
--1
--DROP TABLE t1;
--COMMIT;
--SET AUTOCOMMIT=ON;
--SET GLOBAL debug_dbug = $debug_orig;

mysql-test/suite/galera/r/galera_ist_innodb_flush_logs.result

-connection node_2;
-connection node_1;
-Performing State Transfer on a server that has been killed and restarted
-connection node_1;
-CREATE TABLE t1 (f1 CHAR(255)) ENGINE=InnoDB;
-SET AUTOCOMMIT=OFF;
-START TRANSACTION;
-INSERT INTO t1 VALUES ('node1_committed_before');
-INSERT INTO t1 VALUES ('node1_committed_before');
-INSERT INTO t1 VALUES ('node1_committed_before');
-INSERT INTO t1 VALUES ('node1_committed_before');
-INSERT INTO t1 VALUES ('node1_committed_before');
-COMMIT;
-connection node_2;
-SET AUTOCOMMIT=OFF;
-START TRANSACTION;
-INSERT INTO t1 VALUES ('node2_committed_before');
-INSERT INTO t1 VALUES ('node2_committed_before');
-INSERT INTO t1 VALUES ('node2_committed_before');
-INSERT INTO t1 VALUES ('node2_committed_before');
-INSERT INTO t1 VALUES ('node2_committed_before');
-COMMIT;
-Killing server ...
-connection node_1;
-SET AUTOCOMMIT=OFF;
-START TRANSACTION;
-INSERT INTO t1 VALUES ('node1_committed_during');
-INSERT INTO t1 VALUES ('node1_committed_during');
-INSERT INTO t1 VALUES ('node1_committed_during');
-INSERT INTO t1 VALUES ('node1_committed_during');
-INSERT INTO t1 VALUES ('node1_committed_during');
-COMMIT;
-START TRANSACTION;
-INSERT INTO t1 VALUES ('node1_to_be_committed_after');
-INSERT INTO t1 VALUES ('node1_to_be_committed_after');
-INSERT INTO t1 VALUES ('node1_to_be_committed_after');
-INSERT INTO t1 VALUES ('node1_to_be_committed_after');
-INSERT INTO t1 VALUES ('node1_to_be_committed_after');
-connect node_1a_galera_st_kill_slave, 127.0.0.1, root, , test, $NODE_MYPORT_1;
-SET AUTOCOMMIT=OFF;
-START TRANSACTION;
-INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after');
-INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after');
-INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after');
-INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after');
-INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after');
-connection node_2;
-Performing --wsrep-recover ...
-Starting server ...
-Using --wsrep-start-position when starting mysqld ...
-SET AUTOCOMMIT=OFF;
-START TRANSACTION;
-INSERT INTO t1 VALUES ('node2_committed_after');
-INSERT INTO t1 VALUES ('node2_committed_after');
-INSERT INTO t1 VALUES ('node2_committed_after');
-INSERT INTO t1 VALUES ('node2_committed_after');
-INSERT INTO t1 VALUES ('node2_committed_after');
-COMMIT;
-connection node_1;
-INSERT INTO t1 VALUES ('node1_to_be_committed_after');
-INSERT INTO t1 VALUES ('node1_to_be_committed_after');
-INSERT INTO t1 VALUES ('node1_to_be_committed_after');
-INSERT INTO t1 VALUES ('node1_to_be_committed_after');
-INSERT INTO t1 VALUES ('node1_to_be_committed_after');
-COMMIT;
-SET AUTOCOMMIT=OFF;
-START TRANSACTION;
-INSERT INTO t1 VALUES ('node1_committed_after');
-INSERT INTO t1 VALUES ('node1_committed_after');
-INSERT INTO t1 VALUES ('node1_committed_after');
-INSERT INTO t1 VALUES ('node1_committed_after');
-INSERT INTO t1 VALUES ('node1_committed_after');
-COMMIT;
-connection node_1a_galera_st_kill_slave;
-INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after');
-INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after');
-INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after');
-INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after');
-INSERT INTO t1 VALUES ('node1_to_be_rollbacked_after');
-ROLLBACK;
-SELECT COUNT(*) = 35 FROM t1;
-COUNT(*) = 35
-1
-SELECT COUNT(*) = 0 FROM (SELECT COUNT(*) AS c, f1 FROM t1 GROUP BY f1 HAVING c NOT IN (5, 10)) AS a1;
-COUNT(*) = 0
-1
-COMMIT;
-SET AUTOCOMMIT=ON;
-connection node_1;
-SELECT COUNT(*) = 35 FROM t1;
-COUNT(*) = 35
-1
-SELECT COUNT(*) = 0 FROM (SELECT COUNT(*) AS c, f1 FROM t1 GROUP BY f1 HAVING c NOT IN (5, 10)) AS a1;
-COUNT(*) = 0
-1
-DROP TABLE t1;
-COMMIT;
-SET AUTOCOMMIT=ON;
-Performing State Transfer on a server that has been killed and restarted
-while a DDL was in progress on it
-connection node_1;
-CREATE TABLE t1 (f1 CHAR(255)) ENGINE=InnoDB;
-SET AUTOCOMMIT=OFF;
-START TRANSACTION;
-INSERT INTO t1 VALUES ('node1_committed_before');
-INSERT INTO t1 VALUES ('node1_committed_before');
-INSERT INTO t1 VALUES ('node1_committed_before');
-INSERT INTO t1 VALUES ('node1_committed_before');
-INSERT INTO t1 VALUES ('node1_committed_before');
-connection node_2;
-START TRANSACTION;
-INSERT INTO t1 VALUES ('node2_committed_before');
-INSERT INTO t1 VALUES ('node2_committed_before');
-INSERT INTO t1 VALUES ('node2_committed_before');
-INSERT INTO t1 VALUES ('node2_committed_before');
-INSERT INTO t1 VALUES ('node2_committed_before');
-COMMIT;
-SET GLOBAL debug_dbug = 'd,sync.alter_opened_table';
-connection node_1;
-ALTER TABLE t1 ADD COLUMN f2 INTEGER;
-connection node_2;
-SET wsrep_sync_wait = 0;
-Killing server ...
-connection node_1;
-SET AUTOCOMMIT=OFF;
-START TRANSACTION;
-INSERT INTO t1 (f1) VALUES ('node1_committed_during');
-INSERT INTO t1 (f1) VALUES ('node1_committed_during');
-INSERT INTO t1 (f1) VALUES ('node1_committed_during');
-INSERT INTO t1 (f1) VALUES ('node1_committed_during');
-INSERT INTO t1 (f1) VALUES ('node1_committed_during');
-COMMIT;
-START TRANSACTION;
-INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after');
-INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after');
-INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after');
-INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after');
-INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after');
-connect node_1a_galera_st_kill_slave_ddl, 127.0.0.1, root, , test, $NODE_MYPORT_1;
-SET AUTOCOMMIT=OFF;
-START TRANSACTION;
-INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after');
-INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after');
-INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after');
-INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after');
-INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after');
-connection node_2;
-Performing --wsrep-recover ...
-connection node_2;
-Starting server ...
-Using --wsrep-start-position when starting mysqld ...
-SET AUTOCOMMIT=OFF;
-START TRANSACTION;
-INSERT INTO t1 (f1) VALUES ('node2_committed_after');
-INSERT INTO t1 (f1) VALUES ('node2_committed_after');
-INSERT INTO t1 (f1) VALUES ('node2_committed_after');
-INSERT INTO t1 (f1) VALUES ('node2_committed_after');
-INSERT INTO t1 (f1) VALUES ('node2_committed_after');
-COMMIT;
-connection node_1;
-INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after');
-INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after');
-INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after');
-INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after');
-INSERT INTO t1 (f1) VALUES ('node1_to_be_committed_after');
-COMMIT;
-SET AUTOCOMMIT=OFF;
-START TRANSACTION;
-INSERT INTO t1 (f1) VALUES ('node1_committed_after');
-INSERT INTO t1 (f1) VALUES ('node1_committed_after');
-INSERT INTO t1 (f1) VALUES ('node1_committed_after');
-INSERT INTO t1 (f1) VALUES ('node1_committed_after');
-INSERT INTO t1 (f1) VALUES ('node1_committed_after');
-COMMIT;
-connection node_1a_galera_st_kill_slave_ddl;
-INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after');
-INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after');
-INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after');
-INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after');
-INSERT INTO t1 (f1) VALUES ('node1_to_be_rollbacked_after');
-ROLLBACK;
-SELECT COUNT(*) = 2 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 't1';
-COUNT(*) = 2
-1
-SELECT COUNT(*) = 35 FROM t1;
-COUNT(*) = 35
-1
-SELECT COUNT(*) = 0 FROM (SELECT COUNT(*) AS c, f1 FROM t1 GROUP BY f1 HAVING c NOT IN (5, 10)) AS a1;
-COUNT(*) = 0
-1
-COMMIT;
-SET AUTOCOMMIT=ON;
-connection node_1;
-SELECT COUNT(*) = 2 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 't1';
-COUNT(*) = 2
-1
-SELECT COUNT(*) = 35 FROM t1;
-COUNT(*) = 35
-1
-SELECT COUNT(*) = 0 FROM (SELECT COUNT(*) AS c, f1 FROM t1 GROUP BY f1 HAVING c NOT IN (5, 10)) AS a1;
-COUNT(*) = 0
-1
-DROP TABLE t1;
-COMMIT;
-SET AUTOCOMMIT=ON;
-SET GLOBAL debug_dbug = $debug_orig;

mysql-test/suite/galera/t/galera_autoinc_sst_mariabackup.test

@@ -5,6 +5,7 @@
 
 --source include/big_test.inc
 --source include/galera_cluster.inc
+--source include/have_innodb.inc
 --source include/have_mariabackup.inc
 
 --let $node_1=node_1

mysql-test/suite/galera/t/galera_ist_innodb_flush_logs.cnf

-!include ../galera_2nodes.cnf
-
-[mysqld]
-wsrep_sst_method=mariabackup
-wsrep_sst_auth=root:
-
-innodb_flush_log_at_trx_commit=0
-
-[mysqld.1]
-wsrep_provider_options='base_port=@mysqld.1.#galera_port;pc.ignore_sb=true'
-
-[mysqld.2]
-wsrep_provider_options='base_port=@mysqld.2.#galera_port;pc.ignore_sb=true'

mysql-test/suite/galera/t/galera_ist_innodb_flush_logs.test

-#
-# This test performs server kill and IST while innodb_flush_logs_on_trx_commit = 0
-# This confirms that IST can properly catch up even in the face of relaxed single-node durability
-#
-#
-
---source include/big_test.inc
---source include/galera_cluster.inc
---source include/have_innodb.inc
---source include/have_mariabackup.inc
-
---source suite/galera/include/galera_st_kill_slave.inc
---source suite/galera/include/galera_st_kill_slave_ddl.inc

mysql-test/suite/galera_3nodes/t/galera_ipv6_mariabackup.test

 --source include/galera_cluster.inc
 --source include/check_ipv6.inc
+--source include/have_innodb.inc
 --source include/have_mariabackup.inc
 
 # Confirm that initial handshake happened over ipv6

mysql-test/suite/galera_3nodes/t/galera_ipv6_mariabackup_section.test

 --source include/galera_cluster.inc
 --source include/check_ipv6.inc
+--source include/have_innodb.inc
 --source include/have_mariabackup.inc
 
 # Confirm that initial handshake happened over ipv6