diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-08-21 15:20:34 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-08-21 15:20:34 +0300 |
| commit | 9258097fa3617b720b2b518060c0d09a00455051 (patch) | |
| tree | 0d9e98513620fdb440f1d0f78351ca794a0f731d /sql/wsrep_var.cc | |
| parent | cdc8debcaad6ee18ff7a146ab3f365367fe8ec93 (diff) | |
| parent | dc7c080369472f6f33344299d2e3d01619edf885 (diff) | |
| download | mariadb-git-9258097fa3617b720b2b518060c0d09a00455051.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'sql/wsrep_var.cc')
| -rw-r--r-- | sql/wsrep_var.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/wsrep_var.cc b/sql/wsrep_var.cc index bd33847762d..9c7698aec39 100644 --- a/sql/wsrep_var.cc +++ b/sql/wsrep_var.cc @@ -617,6 +617,12 @@ bool wsrep_desync_check (sys_var *self, THD* thd, set_var* var) return true; } + if (thd->global_read_lock.is_acquired()) + { + my_message (ER_CANNOT_USER, "Global read lock acquired. Can't set 'wsrep_desync'", MYF(0)); + return true; + } + bool new_wsrep_desync= (bool) var->save_result.ulonglong_value; if (wsrep_desync == new_wsrep_desync) { if (new_wsrep_desync) { |