[Commits] 6f7e2515907: Fix test failures

jan jan.lindstrom at mariadb.com
Mon Jan 14 13:15:54 EET 2019


revision-id: 6f7e2515907576b0fc5738fb6cf932352b2dd4e9 (mariadb-10.3.6-299-g6f7e2515907)
parent(s): f5769e497dd1d1b7355b92a0c51970a94726025c
author: Jan Lindström
committer: Jan Lindström
timestamp: 2019-01-14 13:15:38 +0200
message:

Fix test failures
	modified:   mysql-test/suite/galera/r/galera_bf_abort_shutdown.result
	modified:   mysql-test/suite/galera/r/galera_ist_innodb_flush_logs.result
	modified:   mysql-test/suite/galera/t/galera_bf_abort_shutdown.test

---
 mysql-test/suite/galera/r/galera_bf_abort_shutdown.result     |  3 +++
 mysql-test/suite/galera/r/galera_ist_innodb_flush_logs.result |  2 ++
 mysql-test/suite/galera/t/galera_bf_abort_shutdown.test       | 10 ++++++++++
 3 files changed, 15 insertions(+)

diff --git a/mysql-test/suite/galera/r/galera_bf_abort_shutdown.result b/mysql-test/suite/galera/r/galera_bf_abort_shutdown.result
index 08833cbd503..fa2a5c373f2 100644
--- a/mysql-test/suite/galera/r/galera_bf_abort_shutdown.result
+++ b/mysql-test/suite/galera/r/galera_bf_abort_shutdown.result
@@ -1,5 +1,8 @@
 connection node_2;
 connection node_1;
+connection node_1;
+connection node_2;
+connection node_1;
 CREATE TABLE t1 (f1 INT PRIMARY KEY);
 connection node_2;
 SET DEBUG_SYNC = 'wsrep_before_certification WAIT_FOR continue';
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
index 481a85711be..cad00aaee48 100644
--- a/mysql-test/suite/galera/r/galera_ist_innodb_flush_logs.result
+++ b/mysql-test/suite/galera/r/galera_ist_innodb_flush_logs.result
@@ -1,3 +1,5 @@
+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;
diff --git a/mysql-test/suite/galera/t/galera_bf_abort_shutdown.test b/mysql-test/suite/galera/t/galera_bf_abort_shutdown.test
index 0980a1e0262..c7af8375b3f 100644
--- a/mysql-test/suite/galera/t/galera_bf_abort_shutdown.test
+++ b/mysql-test/suite/galera/t/galera_bf_abort_shutdown.test
@@ -9,6 +9,12 @@
 --source include/galera_cluster.inc
 --source include/have_debug_sync.inc
 
+# Save original auto_increment_offset values.
+--let $node_1=node_1
+--let $node_2=node_2
+--source include/auto_increment_offset_save.inc
+
+--connection node_1
 CREATE TABLE t1 (f1 INT PRIMARY KEY);
 
 --connection node_2
@@ -18,6 +24,10 @@ SET DEBUG_SYNC = 'wsrep_before_certification WAIT_FOR continue';
 --connect node_2a, 127.0.0.1, root, , test, $NODE_MYPORT_2
 --source include/restart_mysqld.inc
 
+# Restore original auto_increment_offset values.
+--let $node_2=node_2a
+--source include/auto_increment_offset_restore.inc
+
 --connection node_1
 
 DROP TABLE t1;


More information about the commits mailing list