revision-id: a504c9f7105dfe3d4953b7f13a5738627c18634d (mariadb-10.2.19-16-ga504c9f7105) parent(s): a08ced69bfe42203ac4673ba2718fe17e5f427c0 author: Jan Lindström committer: Jan Lindström timestamp: 2018-11-21 14:36:35 +0200 message: Fix result. --- .../suite/galera/r/galera_sst_mariabackup_table_options.result | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/mysql-test/suite/galera/r/galera_sst_mariabackup_table_options.result b/mysql-test/suite/galera/r/galera_sst_mariabackup_table_options.result index f55a926d4de..6d30a6231eb 100644 --- a/mysql-test/suite/galera/r/galera_sst_mariabackup_table_options.result +++ b/mysql-test/suite/galera/r/galera_sst_mariabackup_table_options.result @@ -1,5 +1,6 @@ Performing State Transfer on a server that starts from a clean var directory This is accomplished by shutting down node #2 and removing its var directory before restarting it +connection node_1; CREATE TABLE t1 (f1 CHAR(255)) ENGINE=InnoDB; CREATE TABLE t2 (f1 CHAR(255)) ENGINE=InnoDB PAGE_COMPRESSED=1; CREATE TABLE t3 (f1 CHAR(255)) ENGINE=InnoDB PAGE_COMPRESSED=1 ENCRYPTED=NO; @@ -57,6 +58,7 @@ insert into t1 values ('node1_committed_before'); insert into t1 values ('node1_committed_before'); insert into t1 values ('node1_committed_before'); COMMIT; +connection node_2; SET AUTOCOMMIT=OFF; START TRANSACTION; insert into t9 values ('node2_committed_before'); @@ -106,6 +108,7 @@ insert into t1 values ('node2_committed_before'); insert into t1 values ('node2_committed_before'); COMMIT; Shutting down server ... +connection node_1; Cleaning var directory ... SET AUTOCOMMIT=OFF; START TRANSACTION; @@ -201,6 +204,7 @@ insert into t1 values ('node1_to_be_committed_after'); insert into t1 values ('node1_to_be_committed_after'); insert into t1 values ('node1_to_be_committed_after'); insert into t1 values ('node1_to_be_committed_after'); +connect node_1a_galera_st_clean_slave, 127.0.0.1, root, , test, $NODE_MYPORT_1; SET AUTOCOMMIT=OFF; START TRANSACTION; insert into t9 values ('node1_to_be_rollbacked_after'); @@ -248,10 +252,12 @@ insert into t1 values ('node1_to_be_rollbacked_after'); insert into t1 values ('node1_to_be_rollbacked_after'); insert into t1 values ('node1_to_be_rollbacked_after'); insert into t1 values ('node1_to_be_rollbacked_after'); +connection node_2; Starting server ... SET AUTOCOMMIT=OFF; START TRANSACTION; COMMIT; +connection node_1; insert into t9 values ('node1_to_be_committed_after'); insert into t9 values ('node1_to_be_committed_after'); insert into t9 values ('node1_to_be_committed_after'); @@ -346,6 +352,7 @@ insert into t1 values ('node1_committed_after'); insert into t1 values ('node1_committed_after'); insert into t1 values ('node1_committed_after'); COMMIT; +connection node_1a_galera_st_clean_slave; ROLLBACK; SELECT COUNT(*) FROM t1; COUNT(*) @@ -664,6 +671,7 @@ node1_committed_after node1_committed_after COMMIT; SET AUTOCOMMIT=ON; +connection node_1; SELECT COUNT(*) FROM t1; COUNT(*) 30