diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-08-28 12:22:56 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-08-28 12:22:56 +0300 |
| commit | 7830fb7f45b3824c0375c00ae2cab357165904cf (patch) | |
| tree | 730521737fdc48e69f7650819e9a29da6487e1f4 /sql/wsrep_var.cc | |
| parent | b805ebd7ed49868f83e6fd3fe72a11ddacdce452 (diff) | |
| parent | 55163ba1bdb1a05daadc66c41c959994231b361c (diff) | |
| download | mariadb-git-7830fb7f45b3824c0375c00ae2cab357165904cf.tar.gz | |
Merge 10.2 into 10.3
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 aaae487b2e2..bc43b844a35 100644 --- a/sql/wsrep_var.cc +++ b/sql/wsrep_var.cc @@ -619,6 +619,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) { |