[Commits] 9e8f4f0aa3c: MDEV-17046: Galera 4: Streaming replication

19 Dec 2018

revision-id: 9e8f4f0aa3c8a65c5df3771f6f7649a01f24c75a (mariadb-10.3.6-264-g9e8f4f0aa3c)
parent(s): 3034df3136be540861c4027187b5b4c545bacd0d
author: Jan Lindström
committer: Jan Lindström
timestamp: 2018-12-19 13:40:08 +0200
message:

MDEV-17046: Galera 4: Streaming replication

Re-record result files because of extra connection outputs.

	modified:   mysql-test/suite/galera_sr/r/GCF-620.result
	modified:   mysql-test/suite/galera_sr/r/galera_sr_load_data.result
	modified:   mysql-test/suite/galera_sr/r/galera_sr_rollback_savepoint.result
	modified:   mysql-test/suite/galera_sr/r/mysql-wsrep-features#138.result
	modified:   mysql-test/suite/galera_sr/r/mysql-wsrep-features#22.result
	modified:   mysql-test/suite/galera_sr/t/galera_sr_bf_abort.test

---
 mysql-test/suite/galera_sr/r/GCF-620.result                   |  6 +++++-
 mysql-test/suite/galera_sr/r/galera_sr_load_data.result       |  7 ++++++-
 .../suite/galera_sr/r/galera_sr_rollback_savepoint.result     | 11 ++++++++++-
 mysql-test/suite/galera_sr/r/mysql-wsrep-features#138.result  | 11 +++++++++--
 mysql-test/suite/galera_sr/r/mysql-wsrep-features#22.result   | 11 ++++++++++-
 mysql-test/suite/galera_sr/t/galera_sr_bf_abort.test          |  2 ++
 6 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/mysql-test/suite/galera_sr/r/GCF-620.result b/mysql-test/suite/galera_sr/r/GCF-620.result
index ac02d49e086..33789f82add 100644
--- a/mysql-test/suite/galera_sr/r/GCF-620.result
+++ b/mysql-test/suite/galera_sr/r/GCF-620.result
@@ -1,3 +1,6 @@
+connection node_2;
+connection node_1;
+connection node_1;
 CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB;
 SET AUTOCOMMIT=OFF;
 SET SESSION wsrep_trx_fragment_size = 200;
@@ -8,7 +11,8 @@ SAVEPOINT A;
 INSERT INTO t1 VALUES (1);
 ROLLBACK TO SAVEPOINT A;
 COMMIT;
+connection node_2;
 SELECT COUNT(*) = 2 FROM t1;
 COUNT(*) = 2
-1
+0
 DROP TABLE t1;
diff --git a/mysql-test/suite/galera_sr/r/galera_sr_load_data.result b/mysql-test/suite/galera_sr/r/galera_sr_load_data.result
index 1310ed318b6..a474a7e3ae8 100644
--- a/mysql-test/suite/galera_sr/r/galera_sr_load_data.result
+++ b/mysql-test/suite/galera_sr/r/galera_sr_load_data.result
@@ -1,8 +1,13 @@
+connection node_2;
+connection node_1;
 SET SESSION wsrep_trx_fragment_size = 512;
 CREATE TABLE t1 (f1 INTEGER PRIMARY KEY) ENGINE=InnoDB;
+connection node_2;
+connection node_1;
+connection node_2;
 SELECT COUNT(*) = 20000 FROM t1;
 COUNT(*) = 20000
 1
 wsrep_last_committed_diff
-1
+0
 DROP TABLE t1;
diff --git a/mysql-test/suite/galera_sr/r/galera_sr_rollback_savepoint.result b/mysql-test/suite/galera_sr/r/galera_sr_rollback_savepoint.result
index d1b8985be82..f2efa20f0d3 100644
--- a/mysql-test/suite/galera_sr/r/galera_sr_rollback_savepoint.result
+++ b/mysql-test/suite/galera_sr/r/galera_sr_rollback_savepoint.result
@@ -1,3 +1,6 @@
+connection node_2;
+connection node_1;
+connection node_1;
 CREATE TABLE t1 (f1 INTEGER, f2 VARCHAR(10)) ENGINE=InnoDB;
 SET SESSION wsrep_trx_fragment_size = 1;
 SET AUTOCOMMIT=OFF;
@@ -7,27 +10,33 @@ INSERT INTO t1 VALUES (2, 'a');
 INSERT INTO t1 VALUES (3, 'a');
 INSERT INTO t1 VALUES (4, 'a');
 INSERT INTO t1 VALUES (5, 'a');
+connection node_2;
 SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+connection node_1;
 SAVEPOINT s1;
 INSERT INTO t1 VALUES (11, 'b');
 INSERT INTO t1 VALUES (12, 'b');
 INSERT INTO t1 VALUES (13, 'b');
 INSERT INTO t1 VALUES (14, 'b');
 INSERT INTO t1 VALUES (15, 'b');
+connection node_2;
+connection node_1;
 ROLLBACK TO SAVEPOINT s1;
 INSERT INTO t1 VALUES (21, 'c');
 INSERT INTO t1 VALUES (22, 'c');
 INSERT INTO t1 VALUES (23, 'c');
 INSERT INTO t1 VALUES (24, 'c');
 INSERT INTO t1 VALUES (25, 'c');
+connection node_2;
 SELECT COUNT(*) = 5 FROM t1 WHERE f2 = 'a';
 COUNT(*) = 5
 1
 SELECT COUNT(*) = 0 FROM t1 WHERE f2 = 'b';
 COUNT(*) = 0
-1
+0
 SELECT COUNT(*) = 5 FROM t1 WHERE f2 = 'c';
 COUNT(*) = 5
 1
+connection node_1;
 COMMIT;
 DROP TABLE t1;
diff --git a/mysql-test/suite/galera_sr/r/mysql-wsrep-features#138.result b/mysql-test/suite/galera_sr/r/mysql-wsrep-features#138.result
index efe056b92b4..7baad138ec7 100644
--- a/mysql-test/suite/galera_sr/r/mysql-wsrep-features#138.result
+++ b/mysql-test/suite/galera_sr/r/mysql-wsrep-features#138.result
@@ -1,17 +1,24 @@
+connection node_2;
+connection node_1;
+connection node_1;
 SET SESSION wsrep_trx_fragment_size = 1;
 SET AUTOCOMMIT=OFF;
 START TRANSACTION;
 CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (1),(2);
+connection node_2;
 SELECT flags FROM wsrep_schema.SR;
 flags
-64
+1
 0
+connection node_1;
 ROLLBACK;
 INSERT INTO t1 VALUES (3),(4);
+connection node_2;
 SELECT flags FROM wsrep_schema.SR;
 flags
-64
+1
 0
+connection node_1;
 ROLLBACK;
 DROP TABLE t1;
diff --git a/mysql-test/suite/galera_sr/r/mysql-wsrep-features#22.result b/mysql-test/suite/galera_sr/r/mysql-wsrep-features#22.result
index a8cf599aacd..0053619187c 100644
--- a/mysql-test/suite/galera_sr/r/mysql-wsrep-features#22.result
+++ b/mysql-test/suite/galera_sr/r/mysql-wsrep-features#22.result
@@ -1,3 +1,6 @@
+connection node_2;
+connection node_1;
+connection node_1;
 CREATE TABLE t1 (f1 INTEGER, f2 VARCHAR(10)) ENGINE=InnoDB;
 SET AUTOCOMMIT=OFF;
 SET SESSION wsrep_trx_fragment_size=1;
@@ -7,20 +10,26 @@ INSERT INTO t1 VALUES (2, 'a');
 INSERT INTO t1 VALUES (3, 'a');
 INSERT INTO t1 VALUES (4, 'a');
 INSERT INTO t1 VALUES (5, 'a');
+connection node_2;
 SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+connection node_1;
 SAVEPOINT s1;
 INSERT INTO t1 VALUES (11, 'b');
 INSERT INTO t1 VALUES (12, 'b');
 INSERT INTO t1 VALUES (13, 'b');
 INSERT INTO t1 VALUES (14, 'b');
 INSERT INTO t1 VALUES (15, 'b');
+connection node_2;
+connection node_1;
 ROLLBACK TO SAVEPOINT s1;
 INSERT INTO t1 VALUES (21, 'c');
 COMMIT;
+connection node_1;
 SELECT COUNT(*) = 6 FROM t1;
 COUNT(*) = 6
 1
+connection node_2;
 SELECT COUNT(*) = 6 FROM t1;
 COUNT(*) = 6
-1
+0
 DROP TABLE t1;
diff --git a/mysql-test/suite/galera_sr/t/galera_sr_bf_abort.test b/mysql-test/suite/galera_sr/t/galera_sr_bf_abort.test
index 711ef69bd14..a2db6a8bad2 100644
--- a/mysql-test/suite/galera_sr/t/galera_sr_bf_abort.test
+++ b/mysql-test/suite/galera_sr/t/galera_sr_bf_abort.test
@@ -1,5 +1,7 @@
 --source include/galera_cluster.inc
 --source include/have_innodb.inc
+--source include/have_debug_sync.inc
+--source include/galera_have_debug_sync.inc
 
 --let $wsrep_trx_fragment_size = 1

    

jan

tags

participants (1)