diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2019-07-15 07:02:18 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2019-07-15 07:02:18 +0300 |
| commit | 1891eb4792f8041bd9c09e4501ebc24e5e2d2a24 (patch) | |
| tree | 03f972d2ea2f6245ce5e630dc25a7e375ca46d5d | |
| parent | c05618f255d323908bdf2289c81a1900fbe46a27 (diff) | |
| download | mariadb-git-bb-10.2-MDEV-19746.tar.gz | |
Try #2bb-10.2-MDEV-19746
| -rw-r--r-- | mysql-test/suite/galera/r/galera_kill_applier.result | 14 | ||||
| -rw-r--r-- | mysql-test/suite/galera/t/galera_kill_applier.test | 18 |
2 files changed, 29 insertions, 3 deletions
diff --git a/mysql-test/suite/galera/r/galera_kill_applier.result b/mysql-test/suite/galera/r/galera_kill_applier.result index 1f91ef08419..075cbe6f702 100644 --- a/mysql-test/suite/galera/r/galera_kill_applier.result +++ b/mysql-test/suite/galera/r/galera_kill_applier.result @@ -1,6 +1,18 @@ -connection node_1; +connection node_2; SET GLOBAL wsrep_slave_threads=2; Got one of the listed errors Got one of the listed errors Got one of the listed errors Got one of the listed errors +SET GLOBAL wsrep_slave_threads=1; +connection node_1; +create table t1(a int not null primary key) engine=innodb; +insert into t1 values (1); +insert into t1 values (2); +connection node_2; +set global wsrep_sync_wait=15; +select count(*) from t1; +count(*) +2 +connection node_1; +drop table t1; diff --git a/mysql-test/suite/galera/t/galera_kill_applier.test b/mysql-test/suite/galera/t/galera_kill_applier.test index f7ca045c35a..4136bac5dc6 100644 --- a/mysql-test/suite/galera/t/galera_kill_applier.test +++ b/mysql-test/suite/galera/t/galera_kill_applier.test @@ -6,10 +6,10 @@ --source include/have_innodb.inc --source include/force_restart.inc ---connection node_1 +--connection node_2 SET GLOBAL wsrep_slave_threads=2; ---let $wait_condition = SELECT COUNT(*) = 2 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE = 'wsrep applier idle'; +--let $wait_condition = SELECT COUNT(*) >= 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE = 'wsrep applier idle'; --let $wait_condition_on_error_output = SELECT COUNT(*), 2 as EXPECTED_VALUE FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE = 'wsrep applier idle'; show processlist --source include/wait_condition_with_debug.inc @@ -30,3 +30,17 @@ SET GLOBAL wsrep_slave_threads=2; --error ER_KILL_DENIED_ERROR,ER_KILL_DENIED_ERROR --eval KILL QUERY $aborter_thread --enable_query_log + +SET GLOBAL wsrep_slave_threads=1; + +--connection node_1 +create table t1(a int not null primary key) engine=innodb; +insert into t1 values (1); +insert into t1 values (2); + +--connection node_2 +set global wsrep_sync_wait=15; +select count(*) from t1; + +--connection node_1 +drop table t1; |