Skip to content
Permalink
Browse files
SET wsrep_on=1 - only check innodb_lock_schedule_algorithm if innodb …
…is enabled
  • Loading branch information
vuvova committed Jun 21, 2018
1 parent b942aa3 commit 082eec1
Showing 1 changed file with 2 additions and 1 deletion.
@@ -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)
{
@@ -65,7 +66,7 @@ bool wsrep_on_check(sys_var *self, THD* thd, set_var* var)
if (check_has_super(self, thd, var))
return true;

if (new_wsrep_on && innodb_lock_schedule_algorithm != 0) {
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));

0 comments on commit 082eec1

Please sign in to comment.