diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-26 14:05:15 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-26 14:05:15 +0200 |
| commit | 1afed2077491329797dd577c5b1e6594e4a82f65 (patch) | |
| tree | a6869ae2e32dc2a7db8e01e2a69f3e350da831ee /sql/wsrep_var.cc | |
| parent | 06972b2fbc3d3ae77e8a7ca4558d2e9ee64eba6d (diff) | |
| parent | 9669536c2355efb6f71babc9d2e615e9125c816b (diff) | |
| download | mariadb-git-1afed2077491329797dd577c5b1e6594e4a82f65.tar.gz | |
Merge 10.2 into 10.3
The test galera_sst_mariabackup_table_options was disabled,
because the server refuses to start up due to wrong parameters.
Diffstat (limited to 'sql/wsrep_var.cc')
| -rw-r--r-- | sql/wsrep_var.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/wsrep_var.cc b/sql/wsrep_var.cc index f8a494416e2..1471ad91a96 100644 --- a/sql/wsrep_var.cc +++ b/sql/wsrep_var.cc @@ -428,7 +428,8 @@ bool wsrep_reject_queries_update(sys_var *self, THD* thd, enum_var_type type) WSREP_INFO("Rejecting client queries due to manual setting"); break; case WSREP_REJECT_ALL_KILL: - wsrep_close_client_connections(FALSE); + /* close all client connections, but this one */ + wsrep_close_client_connections(FALSE, thd); WSREP_INFO("Rejecting client queries and killing connections due to manual setting"); break; default: |