From 0a6b21b6733df411f4814ec28f6b6c70f979b8af Mon Sep 17 00:00:00 2001 From: Julius Goryavsky Date: Thu, 18 Jul 2019 14:31:07 +0200 Subject: [PATCH] Fixed dependency checking in some Galera tests + remove duplicates --- ...galera_ist_innodb_flush_logs,release.rdiff | 114 ---------- .../r/galera_ist_innodb_flush_logs.result | 204 ------------------ .../t/galera_autoinc_sst_mariabackup.test | 1 + .../galera/t/galera_ist_innodb_flush_logs.cnf | 13 -- .../t/galera_ist_innodb_flush_logs.test | 12 -- ...era_ist_mariabackup_innodb_flush_logs.test | 1 + .../t/galera_ipv6_mariabackup.test | 1 + .../t/galera_ipv6_mariabackup_section.test | 1 + 8 files changed, 4 insertions(+), 343 deletions(-) delete mode 100644 mysql-test/suite/galera/r/galera_ist_innodb_flush_logs,release.rdiff delete mode 100644 mysql-test/suite/galera/r/galera_ist_innodb_flush_logs.result delete mode 100644 mysql-test/suite/galera/t/galera_ist_innodb_flush_logs.cnf delete mode 100644 mysql-test/suite/galera/t/galera_ist_innodb_flush_logs.test diff --git a/mysql-test/suite/galera/r/galera_ist_innodb_flush_logs,release.rdiff b/mysql-test/suite/galera/r/galera_ist_innodb_flush_logs,release.rdiff deleted file mode 100644 index bbd75f5230a..00000000000 --- a/mysql-test/suite/galera/r/galera_ist_innodb_flush_logs,release.rdiff +++ /dev/null @@ -1,114 +0,0 @@ ---- 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; diff --git a/mysql-test/suite/galera/r/galera_ist_innodb_flush_logs.result b/mysql-test/suite/galera/r/galera_ist_innodb_flush_logs.result deleted file mode 100644 index 481a85711be..00000000000 --- a/mysql-test/suite/galera/r/galera_ist_innodb_flush_logs.result +++ /dev/null @@ -1,204 +0,0 @@ -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; diff --git a/mysql-test/suite/galera/t/galera_autoinc_sst_mariabackup.test b/mysql-test/suite/galera/t/galera_autoinc_sst_mariabackup.test index 6aa8ad2923c..d4d8291ae7d 100644 --- a/mysql-test/suite/galera/t/galera_autoinc_sst_mariabackup.test +++ b/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 diff --git a/mysql-test/suite/galera/t/galera_ist_innodb_flush_logs.cnf b/mysql-test/suite/galera/t/galera_ist_innodb_flush_logs.cnf deleted file mode 100644 index 7979b23e085..00000000000 --- a/mysql-test/suite/galera/t/galera_ist_innodb_flush_logs.cnf +++ /dev/null @@ -1,13 +0,0 @@ -!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' diff --git a/mysql-test/suite/galera/t/galera_ist_innodb_flush_logs.test b/mysql-test/suite/galera/t/galera_ist_innodb_flush_logs.test deleted file mode 100644 index 514564ffb72..00000000000 --- a/mysql-test/suite/galera/t/galera_ist_innodb_flush_logs.test +++ /dev/null @@ -1,12 +0,0 @@ -# -# 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_mariabackup.inc - ---source suite/galera/include/galera_st_kill_slave.inc ---source suite/galera/include/galera_st_kill_slave_ddl.inc diff --git a/mysql-test/suite/galera/t/galera_ist_mariabackup_innodb_flush_logs.test b/mysql-test/suite/galera/t/galera_ist_mariabackup_innodb_flush_logs.test index 514564ffb72..fd362a26840 100644 --- a/mysql-test/suite/galera/t/galera_ist_mariabackup_innodb_flush_logs.test +++ b/mysql-test/suite/galera/t/galera_ist_mariabackup_innodb_flush_logs.test @@ -6,6 +6,7 @@ --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 diff --git a/mysql-test/suite/galera_3nodes/t/galera_ipv6_mariabackup.test b/mysql-test/suite/galera_3nodes/t/galera_ipv6_mariabackup.test index 8cbd8cf2454..808dad0dbb2 100644 --- a/mysql-test/suite/galera_3nodes/t/galera_ipv6_mariabackup.test +++ b/mysql-test/suite/galera_3nodes/t/galera_ipv6_mariabackup.test @@ -1,5 +1,6 @@ --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 diff --git a/mysql-test/suite/galera_3nodes/t/galera_ipv6_mariabackup_section.test b/mysql-test/suite/galera_3nodes/t/galera_ipv6_mariabackup_section.test index 88c399ddb99..72f4fde299b 100644 --- a/mysql-test/suite/galera_3nodes/t/galera_ipv6_mariabackup_section.test +++ b/mysql-test/suite/galera_3nodes/t/galera_ipv6_mariabackup_section.test @@ -1,5 +1,6 @@ --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