revision-id: 4f8a21caa269be6e8091fbb93aac01f88d0eb6e0 (mariadb-10.2.22-49-g4f8a21caa26) parent(s): ec96d5ab41e458b6397f5bbe83736f9c1405acf9 author: Jan Lindström committer: Jan Lindström timestamp: 2019-03-11 12:14:09 +0200 message: Update results. --- mysql-test/suite/galera/r/galera_kill_smallchanges.result | 2 -- mysql-test/suite/galera/r/galera_var_slave_threads.result | 13 ++++++++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/mysql-test/suite/galera/r/galera_kill_smallchanges.result b/mysql-test/suite/galera/r/galera_kill_smallchanges.result index e4d7161c71a..7542727b100 100644 --- a/mysql-test/suite/galera/r/galera_kill_smallchanges.result +++ b/mysql-test/suite/galera/r/galera_kill_smallchanges.result @@ -1,6 +1,4 @@ connection node_1; -connection node_2; -connection node_1; SET GLOBAL wsrep_provider_options = 'pc.ignore_sb=true'; CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB; connection node_2; diff --git a/mysql-test/suite/galera/r/galera_var_slave_threads.result b/mysql-test/suite/galera/r/galera_var_slave_threads.result index c28cc091ae9..eda30755aed 100644 --- a/mysql-test/suite/galera/r/galera_var_slave_threads.result +++ b/mysql-test/suite/galera/r/galera_var_slave_threads.result @@ -12,6 +12,7 @@ Warning 1292 Truncated incorrect wsrep_slave_threads value: '0' SELECT @@wsrep_slave_threads = 1; @@wsrep_slave_threads = 1 1 +# wsrep_slave_threads = 1 SET GLOBAL wsrep_slave_threads = 1; SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE LIKE '%wsrep aborter%'; COUNT(*) @@ -20,15 +21,17 @@ SET GLOBAL wsrep_slave_threads = 64; connection node_1; INSERT INTO t1 VALUES (1); connection node_2; -SELECT COUNT(*) = 1 FROM t1; -COUNT(*) = 1 +SELECT COUNT(*) FROM t1; +COUNT(*) 1 +# wsrep_slave_threads = 64 SET GLOBAL wsrep_slave_threads = 1; connection node_1; connection node_2; SELECT COUNT(*) FROM t2; COUNT(*) -64 +66 +# wsrep_slave_threads = 1 SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE LIKE '%wsrep aborter%'; COUNT(*) 1 @@ -42,11 +45,15 @@ connection node_1; CREATE TABLE t1 (i INT AUTO_INCREMENT PRIMARY KEY) ENGINE=INNODB; connection node_2; SET GLOBAL wsrep_slave_threads = 4; +# wsrep_slave_threads = 4 SET GLOBAL wsrep_slave_threads = 1; connection node_1; INSERT INTO t1 VALUES (DEFAULT); INSERT INTO t1 VALUES (DEFAULT); INSERT INTO t1 VALUES (DEFAULT); +INSERT INTO t1 VALUES (DEFAULT); +INSERT INTO t1 VALUES (DEFAULT); +INSERT INTO t1 VALUES (DEFAULT); DROP TABLE t1; connection node_2; SELECT NAME FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES WHERE NAME LIKE 'test/t%';