diff options
Diffstat (limited to 'sql/wsrep_var.cc')
| -rw-r--r-- | sql/wsrep_var.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/wsrep_var.cc b/sql/wsrep_var.cc index d94ac240b76..7fe120beb8e 100644 --- a/sql/wsrep_var.cc +++ b/sql/wsrep_var.cc @@ -47,6 +47,7 @@ int wsrep_init_vars() linking will succeed even if the server is built with a dynamically linked InnoDB. */ ulong innodb_lock_schedule_algorithm __attribute__((weak)); +struct handlerton* innodb_hton_ptr __attribute__((weak)); bool wsrep_on_update (sys_var *self, THD* thd, enum_var_type var_type) { @@ -62,7 +63,10 @@ bool wsrep_on_check(sys_var *self, THD* thd, set_var* var) { bool new_wsrep_on= (bool)var->save_result.ulonglong_value; - if (new_wsrep_on && innodb_lock_schedule_algorithm != 0) { + if (check_has_super(self, thd, var)) + return true; + + if (new_wsrep_on && innodb_hton_ptr && innodb_lock_schedule_algorithm != 0) { my_message(ER_WRONG_ARGUMENTS, " WSREP (galera) can't be enabled " "if innodb_lock_schedule_algorithm=VATS. Please configure" " innodb_lock_schedule_algorithm=FCFS and restart.", MYF(0)); |