diff options
| author | Daniel Black <daniel@mariadb.org> | 2022-03-16 12:51:22 +1100 |
|---|---|---|
| committer | Daniel Black <daniel@mariadb.org> | 2022-03-16 12:51:22 +1100 |
| commit | 6a2d88c132221ea07dd322060089c85ff5e469b5 (patch) | |
| tree | af9a61d61f50b9dd2209cad74552bf434d224cff /mysql-test/suite/galera | |
| parent | 0e63023cb8f7e52506241723c105d31051a57820 (diff) | |
| parent | 57dbe8785d14a4b9e5b9dc17625cd00f615e136d (diff) | |
| download | mariadb-git-6a2d88c132221ea07dd322060089c85ff5e469b5.tar.gz | |
Merge 10.2 to 10.3
Diffstat (limited to 'mysql-test/suite/galera')
| -rw-r--r-- | mysql-test/suite/galera/r/galera_kill_applier.result | 4 | ||||
| -rw-r--r-- | mysql-test/suite/galera/t/galera_kill_applier.test | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/mysql-test/suite/galera/r/galera_kill_applier.result b/mysql-test/suite/galera/r/galera_kill_applier.result index 075cbe6f702..0b1a0c12d0d 100644 --- a/mysql-test/suite/galera/r/galera_kill_applier.result +++ b/mysql-test/suite/galera/r/galera_kill_applier.result @@ -1,8 +1,12 @@ connection node_2; SET GLOBAL wsrep_slave_threads=2; +KILL ID; Got one of the listed errors +KILL QUERY ID; Got one of the listed errors +KILL ID; Got one of the listed errors +KILL QUERY ID; Got one of the listed errors SET GLOBAL wsrep_slave_threads=1; connection node_1; diff --git a/mysql-test/suite/galera/t/galera_kill_applier.test b/mysql-test/suite/galera/t/galera_kill_applier.test index 4136bac5dc6..c9ff795bab6 100644 --- a/mysql-test/suite/galera/t/galera_kill_applier.test +++ b/mysql-test/suite/galera/t/galera_kill_applier.test @@ -15,21 +15,23 @@ SET GLOBAL wsrep_slave_threads=2; --let $applier_thread = `SELECT ID FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE = 'wsrep applier idle' LIMIT 1` ---disable_query_log +--replace_result $applier_thread ID --error ER_KILL_DENIED_ERROR,ER_KILL_DENIED_ERROR --eval KILL $applier_thread +--replace_result $applier_thread ID --error ER_KILL_DENIED_ERROR,ER_KILL_DENIED_ERROR --eval KILL QUERY $applier_thread --let $aborter_thread = `SELECT ID FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE = 'wsrep aborter idle' LIMIT 1` +--replace_result $aborter_thread ID --error ER_KILL_DENIED_ERROR,ER_KILL_DENIED_ERROR --eval KILL $aborter_thread +--replace_result $aborter_thread ID --error ER_KILL_DENIED_ERROR,ER_KILL_DENIED_ERROR --eval KILL QUERY $aborter_thread ---enable_query_log SET GLOBAL wsrep_slave_threads=1; |