MDEV-23574 : galera_3nodes.galera_ipv6_mariabackup_section MTR failed: Could not open '../galera/include/have_mariabackup.inc'

Test case and configuration cleanup.

Author: janlindstrom

mysql-test/suite/galera_3nodes/r/GAL-501.result

@@ -7,11 +7,11 @@ VARIABLE_VALUE = 3
 connection node_2;
 SET GLOBAL wsrep_provider_options='gmcast.isolate=1';
 connection node_1;
-CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB;
+CREATE TABLE t1 (f1 INTEGER NOT NULL PRIMARY KEY) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (1);
 connection node_2;
 SET GLOBAL wsrep_provider_options='gmcast.isolate=0';
-SELECT COUNT(*) = 1 FROM t1;
-COUNT(*) = 1
+SELECT COUNT(*) AS EXPECT_1 FROM t1;
+EXPECT_1
 1
 DROP TABLE t1;

mysql-test/suite/galera_3nodes/r/galera_ipv6_mariabackup.result

@@ -7,12 +7,12 @@ VARIABLE_VALUE = 3
 connection node_2;
 SET GLOBAL wsrep_provider_options='gmcast.isolate=1';
 connection node_1;
-CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB;
+CREATE TABLE t1 (f1 INTEGER NOT NULL PRIMARY KEY) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (1);
 connection node_2;
 SET GLOBAL wsrep_provider_options='gmcast.isolate=0';
-SELECT COUNT(*) = 1 FROM t1;
-COUNT(*) = 1
+SELECT COUNT(*) AS EXPECT_1 FROM t1;
+EXPECT_1
 1
 DROP TABLE t1;
 connection node_1;

mysql-test/suite/galera_3nodes/r/galera_ipv6_mariabackup_section.result

@@ -7,12 +7,12 @@ VARIABLE_VALUE = 3
 connection node_2;
 SET GLOBAL wsrep_provider_options='gmcast.isolate=1';
 connection node_1;
-CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB;
+CREATE TABLE t1 (f1 INTEGER NOT NULL PRIMARY KEY) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (1);
 connection node_2;
 SET GLOBAL wsrep_provider_options='gmcast.isolate=0';
-SELECT COUNT(*) = 1 FROM t1;
-COUNT(*) = 1
+SELECT COUNT(*) AS EXPECT_1 FROM t1;
+EXPECT_1
 1
 DROP TABLE t1;
 connection node_1;

mysql-test/suite/galera_3nodes/r/galera_ipv6_mysqldump.result

@@ -12,12 +12,12 @@ SET GLOBAL wsrep_sst_method = 'mysqldump';
 Shutting down server ...
 connection node_1;
 Cleaning var directory ...
-CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB;
+CREATE TABLE t1 (f1 INTEGER NOT NULL PRIMARY KEY) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (1);
 connection node_2;
 Starting server ...
-SELECT COUNT(*) = 1 FROM t1;
-COUNT(*) = 1
+SELECT COUNT(*) AS EXPECT_1 FROM t1;
+EXPECT_1
 1
 DROP TABLE t1;
 SELECT VARIABLE_VALUE LIKE '%[::1]%' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_incoming_addresses';

mysql-test/suite/galera_3nodes/r/galera_ipv6_rsync.result

@@ -7,11 +7,11 @@ VARIABLE_VALUE = 3
 connection node_2;
 SET GLOBAL wsrep_provider_options='gmcast.isolate=1';
 connection node_1;
-CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB;
+CREATE TABLE t1 (f1 INTEGER NOT NULL PRIMARY KEY) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (1);
 connection node_2;
 SET GLOBAL wsrep_provider_options='gmcast.isolate=0';
-SELECT COUNT(*) = 1 FROM t1;
-COUNT(*) = 1
+SELECT COUNT(*) AS EXPECT_1 FROM t1;
+EXPECT_1
 1
 DROP TABLE t1;

mysql-test/suite/galera_3nodes/r/galera_ipv6_rsync_section.result

@@ -7,11 +7,11 @@ VARIABLE_VALUE = 3
 connection node_2;
 SET GLOBAL wsrep_provider_options='gmcast.isolate=1';
 connection node_1;
-CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB;
+CREATE TABLE t1 (f1 INTEGER NOT NULL PRIMARY KEY) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (1);
 connection node_2;
 SET GLOBAL wsrep_provider_options='gmcast.isolate=0';
-SELECT COUNT(*) = 1 FROM t1;
-COUNT(*) = 1
+SELECT COUNT(*) AS EXPECT_1 FROM t1;
+EXPECT_1
 1
 DROP TABLE t1;

mysql-test/suite/galera_3nodes/t/GAL-501.cnf

@@ -10,17 +10,20 @@ wsrep_node_address=[::1]
 wsrep_provider_options='base_port=@mysqld.1.#galera_port;gmcast.listen_addr=tcp://[::]:@mysqld.1.#galera_port;ist.recv_addr=[::1]'
 wsrep_sst_receive_address='[::1]:@mysqld.1.#sst_port'
 wsrep_node_incoming_address='[::1]:@mysqld.1.port'
+bind-address=::
 
 [mysqld.2]
 wsrep_cluster_address='gcomm://[::1]:@mysqld.1.#galera_port'
 wsrep_node_address=[::1]
 wsrep_provider_options='base_port=@mysqld.2.#galera_port;gmcast.listen_addr=tcp://[::]:@mysqld.2.#galera_port;ist.recv_addr=[::1]'
 wsrep_sst_receive_address='[::1]:@mysqld.2.#sst_port'
 wsrep_node_incoming_address='[::1]:@mysqld.2.port'
+bind-address=::
 
 [mysqld.3]
 wsrep_cluster_address='gcomm://[::1]:@mysqld.1.#galera_port'
 wsrep_node_address=[::1]
 wsrep_provider_options='base_port=@mysqld.3.#galera_port;gmcast.listen_addr=tcp://[::]:@mysqld.3.#galera_port;ist.recv_addr=[::1]'
 wsrep_sst_receive_address='[::1]:@mysqld.3.#sst_port'
 wsrep_node_incoming_address='[::1]:@mysqld.3.port'
+bind-address=::

mysql-test/suite/galera_3nodes/t/GAL-501.opt

@@ -6,6 +6,7 @@
 
 --source include/galera_cluster.inc
 --source include/check_ipv6.inc
+--source include/force_restart.inc
 
 # Confirm that initial handshake happened over ipv6
 
@@ -21,7 +22,7 @@ SET GLOBAL wsrep_provider_options='gmcast.isolate=1';
 --let $wait_condition = SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
 --source include/wait_condition.inc
 
-CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB;
+CREATE TABLE t1 (f1 INTEGER NOT NULL PRIMARY KEY) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (1);
 
 --connection node_2
@@ -33,6 +34,6 @@ SET GLOBAL wsrep_provider_options='gmcast.isolate=0';
 --let $wait_condition = SELECT VARIABLE_VALUE = 'ON' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_ready';
 --source include/wait_condition.inc
 
-SELECT COUNT(*) = 1 FROM t1;
+SELECT COUNT(*) AS EXPECT_1 FROM t1;
 
 DROP TABLE t1;

mysql-test/suite/galera_3nodes/t/GAL-501.test

@@ -10,18 +10,21 @@ wsrep-cluster-address=gcomm://
 wsrep_provider_options='base_host=[::1];base_port=@mysqld.1.#galera_port;gmcast.listen_addr=tcp://[::]:@mysqld.1.#galera_port;ist.recv_addr=[::1]:@mysqld.1.#ist_port'
 wsrep_sst_receive_address='[::1]:@mysqld.1.#sst_port'
 wsrep_node_incoming_address='[::1]:@mysqld.1.port'
+bind-address=::
 
 [mysqld.2]
 wsrep_cluster_address='gcomm://[::1]:@mysqld.1.#galera_port'
 wsrep_provider_options='base_host=[::1];base_port=@mysqld.2.#galera_port;gmcast.listen_addr=tcp://[::]:@mysqld.2.#galera_port;ist.recv_addr=[::1]:@mysqld.2.#ist_port'
 wsrep_sst_receive_address='[::1]:@mysqld.2.#sst_port'
 wsrep_node_incoming_address='[::1]:@mysqld.2.port'
+bind-address=::
 
 [mysqld.3]
 wsrep_cluster_address='gcomm://[::1]:@mysqld.1.#galera_port'
 wsrep_provider_options='base_host=[::1];base_port=@mysqld.3.#galera_port;gmcast.listen_addr=tcp://[::]:@mysqld.3.#galera_port;ist.recv_addr=[::1]:@mysqld.3.#ist_port'
 wsrep_sst_receive_address='[::1]:@mysqld.3.#sst_port'
 wsrep_node_incoming_address='[::1]:@mysqld.3.port'
+bind-address=::
 
 [SST]
 transferfmt=@ENV.MTR_GALERA_TFMT