tempesta fixes

mysql-test/suite/galera_3nodes/include/have_mariabackup.inc

-#
-# suite.pm will make sure that all tests including this file
-# will be skipped as needed
-#

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

@@ -79,13 +79,8 @@ VARIABLE_VALUE = 'Synced'
 SET GLOBAL wsrep_provider_options = 'pc.weight=1';
 SELECT VARIABLE_VALUE = 1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_weight';
 VARIABLE_VALUE = 1
-<<<<<<< HEAD
-connection node_1;
-||||||| merged common ancestors
-=======
 1
 connection node_1;
->>>>>>> 10.2
 SET GLOBAL wsrep_provider_options = 'gmcast.isolate=0';
 connection node_2;
 connection node_3;

mysql-test/suite/galera_3nodes/suite.pm

@@ -50,7 +50,6 @@ push @::global_suppressions,
      qr(WSREP: There are no nodes in the same segment that will ever be able to become donors, yet there is a suitable donor outside. Will use that one.),
      qr(WSREP: evs::proto.*),
      qr|WSREP: Ignoring possible split-brain \(allowed by configuration\) from view:.*|,
-     qr|WSREP: Ignoring possible split-brain \(allowed by configuration\) from view:.*|,
      qr(WSREP: no nodes coming from prim view, prim not possible),
      qr(WSREP: Member .* requested state transfer from .* but it is impossible to select State Transfer donor: Resource temporarily unavailable),
      qr(WSREP: user message in state LEAVING),

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

@@ -10,6 +10,7 @@
 --let $galera_connection_name = node_3
 --let $galera_server_number = 3
 --source include/galera_connect.inc
+
 # Save original auto_increment_offset values.
 --let $node_1=node_1
 --let $node_2=node_2

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

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

mysql-test/suite/galera_3nodes/t/galera_ipv6_xtrabackup-v2.opt

---bind-address=:: --skip-innodb-safe-truncate