Fix for some failing tests

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

@@ -49,12 +49,3 @@ VARIABLE_VALUE = 'Primary'
 SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
 VARIABLE_VALUE = 2
 1
-CALL mtr.add_suppression("WSREP: .*Backend not supported: foo.*");
-CALL mtr.add_suppression("WSREP: .*Failed to initialize backend using 'foo.*");
-CALL mtr.add_suppression("WSREP: .*Failed to open channel 'my_wsrep_cluster' at 'foo*");
-CALL mtr.add_suppression("WSREP: gcs connect failed: Socket type not supported");
-CALL mtr.add_suppression("WSREP: failed to open gcomm backend connection: 110: failed to reach primary view: 110 \\(Connection timed out\\)");
-CALL mtr.add_suppression("WSREP: .*Failed to open backend connection: -110 \\(Connection timed out\\)");
-CALL mtr.add_suppression("WSREP: .*Failed to open channel 'my_wsrep_cluster' at 'gcomm://192\\.0\\.2\\.1': -110 \\(Connection timed out\\)");
-CALL mtr.add_suppression("WSREP: gcs connect failed: Connection timed out");
-CALL mtr.add_suppression("WSREP: wsrep::connect\\(\\) failed: 7");

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

@@ -1,7 +1,3 @@
-call mtr.add_suppression('WSREP: transaction size limit.*');
-call mtr.add_suppression('WSREP: rbr write fail.*');
-call mtr.add_suppression('WSREP: Maximum writeset size exceeded by.*');
-call mtr.add_suppression('WSREP: transaction size exceeded.*');
 CREATE TABLE t1 (f1 INTEGER AUTO_INCREMENT PRIMARY KEY, f2 VARCHAR(1024)) Engine=InnoDB;
 SET GLOBAL wsrep_max_ws_size = 1024;
 INSERT INTO t1 VALUES (DEFAULT, REPEAT('X', 1024));

mysql-test/suite/galera/suite.pm

@@ -45,9 +45,20 @@ push @::global_suppressions,
      qr(WSREP: user message in state LEAVING),
      qr(WSREP: .* sending install message failed: Transport endpoint is not connected),
      qr(WSREP: Maximum writeset size exceeded by .*),
-     qr(WSREP: transaction size exceeded),
+     qr(WSREP: transaction size exceeded.*),
      qr(WSREP: RBR event .*),
      qr(WSREP: Ignoring error for TO isolated action: .*),
+     qr(WSREP: transaction size limit .*),
+     qr(WSREP: rbr write fail, .*),
+     qr(WSREP: .*Backend not supported: foo.*),
+     qr(WSREP: .*Failed to initialize backend using .*),
+     qr(WSREP: .*Failed to open channel 'my_wsrep_cluster' at .*),
+     qr(WSREP: gcs connect failed: Socket type not supported),
+     qr(WSREP: failed to open gcomm backend connection: 110: failed to reach primary view: 110 .*),
+     qr(WSREP: .*Failed to open backend connection: -110 .*),
+     qr(WSREP: .*Failed to open channel 'my_wsrep_cluster' at .*),
+     qr(WSREP: gcs connect failed: Connection timed out),
+     qr|WSREP: wsrep::connect\(\) failed: 7|,
    );
 
 

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

@@ -5,6 +5,12 @@
 --source include/galera_cluster.inc
 --source include/have_innodb.inc
 
+# Save original auto_increment_offset values.
+--connection node_1
+let $auto_increment_offset_node_1 = `SELECT @@global.auto_increment_offset`;
+--connection node_2
+let $auto_increment_offset_node_2 = `SELECT @@global.auto_increment_offset`;
+
 --connection node_1
 CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (1);
@@ -21,3 +27,12 @@ SELECT COUNT(*) = 1 FROM t1;
 SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
 
 DROP TABLE t1;
+
+--disable_query_log
+# Restore original auto_increment_offset values.
+--connection node_1
+--eval SET @@global.auto_increment_offset = $auto_increment_offset_node_1;
+--connection node_2a
+--eval SET @@global.auto_increment_offset = $auto_increment_offset_node_2;
+--enable_query_log
+

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

@@ -7,6 +7,12 @@
 --source include/galera_cluster.inc
 --source include/have_innodb.inc
 
+# Save original auto_increment_offset values.
+--connection node_1
+let $auto_increment_offset_node_1 = `SELECT @@global.auto_increment_offset`;
+--connection node_2
+let $auto_increment_offset_node_2 = `SELECT @@global.auto_increment_offset`;
+
 --connection node_1
 CREATE TABLE t1 (f1 INTEGER PRIMARY KEY) ENGINE=InnoDB;
 
@@ -49,3 +55,12 @@ INSERT INTO t1 VALUES (1);
 SELECT COUNT(*) = 1 FROM t1;
 
 DROP TABLE t1;
+
+--disable_query_log
+# Restore original auto_increment_offset values.
+--connection node_1
+--eval SET @@global.auto_increment_offset = $auto_increment_offset_node_1;
+--connection node_2a
+--eval SET @@global.auto_increment_offset = $auto_increment_offset_node_2;
+--enable_query_log
+

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

@@ -93,13 +93,3 @@ SET GLOBAL wsrep_cluster_address = @@wsrep_cluster_address;
 SELECT VARIABLE_VALUE = 'Primary' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_status';
 SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
 
-CALL mtr.add_suppression("WSREP: .*Backend not supported: foo.*");
-CALL mtr.add_suppression("WSREP: .*Failed to initialize backend using 'foo.*");
-CALL mtr.add_suppression("WSREP: .*Failed to open channel 'my_wsrep_cluster' at 'foo*");
-CALL mtr.add_suppression("WSREP: gcs connect failed: Socket type not supported");
-CALL mtr.add_suppression("WSREP: failed to open gcomm backend connection: 110: failed to reach primary view: 110 \\(Connection timed out\\)");
-CALL mtr.add_suppression("WSREP: .*Failed to open backend connection: -110 \\(Connection timed out\\)");
-CALL mtr.add_suppression("WSREP: .*Failed to open channel 'my_wsrep_cluster' at 'gcomm://192\\.0\\.2\\.1': -110 \\(Connection timed out\\)");
-CALL mtr.add_suppression("WSREP: gcs connect failed: Connection timed out");
-CALL mtr.add_suppression("WSREP: wsrep::connect\\(\\) failed: 7");
-#CALL mtr.add_suppression("gcs_caused\\(\\) returned -103 \\(Software caused connection abort\\)");

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

@@ -6,10 +6,6 @@
 --source include/have_innodb.inc
 
 --connection node_1
-call mtr.add_suppression('WSREP: transaction size limit.*');
-call mtr.add_suppression('WSREP: rbr write fail.*');
-call mtr.add_suppression('WSREP: Maximum writeset size exceeded by.*');
-call mtr.add_suppression('WSREP: transaction size exceeded.*');
 
 CREATE TABLE t1 (f1 INTEGER AUTO_INCREMENT PRIMARY KEY, f2 VARCHAR(1024)) Engine=InnoDB;