diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-06-21 23:47:39 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-06-21 23:47:39 +0200 |
| commit | b942aa34c10ddfa3fe4977ae60afed5cbdc51083 (patch) | |
| tree | 0a1a934ca7b728e3ffb81cd2f7c6a858524726d4 /sql/wsrep_var.cc | |
| parent | fe3f9fa9183ea3d10397b6f7f4d422ae9bba00a4 (diff) | |
| parent | c09a8b5b36edb494e2bcc93074c06e26cd9f2b92 (diff) | |
| download | mariadb-git-b942aa34c10ddfa3fe4977ae60afed5cbdc51083.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'sql/wsrep_var.cc')
| -rw-r--r-- | sql/wsrep_var.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/wsrep_var.cc b/sql/wsrep_var.cc index 38d727fb470..0bca5d1177d 100644 --- a/sql/wsrep_var.cc +++ b/sql/wsrep_var.cc @@ -62,6 +62,9 @@ bool wsrep_on_check(sys_var *self, THD* thd, set_var* var) { bool new_wsrep_on= (bool)var->save_result.ulonglong_value; + if (check_has_super(self, thd, var)) + return true; + if (new_wsrep_on && innodb_lock_schedule_algorithm != 0) { my_message(ER_WRONG_ARGUMENTS, " WSREP (galera) can't be enabled " "if innodb_lock_schedule_algorithm=VATS. Please configure" |