MDEV-29706 : SIGSEGV in wsrep_TOI_begin on non-Galera builds

Do not allow setting wsrep_on=ON if no provider is set.
MariaDB · Oct 6, 2022 · 09f7889 · 09f7889
1 parent 074e358
commit 09f7889
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 45 deletions.
diff --git a/mysql-test/suite/sys_vars/r/wsrep_on_without_provider.result b/mysql-test/suite/sys_vars/r/wsrep_on_without_provider.result
@@ -0,0 +1,5 @@
+SET GLOBAL wsrep_on=ON;
+ERROR HY000: WSREP (galera) can't be enabled if the wsrep_provider is unset or set to 'none'
+SELECT @@global.wsrep_on;
+@@global.wsrep_on
+0
diff --git a/mysql-test/suite/sys_vars/t/wsrep_on_basic.test b/mysql-test/suite/sys_vars/t/wsrep_on_basic.test
diff --git a/mysql-test/suite/sys_vars/t/wsrep_on_without_provider.test b/mysql-test/suite/sys_vars/t/wsrep_on_without_provider.test
@@ -0,0 +1,9 @@
+--source include/not_embedded.inc
+
+#
+# @@global.wsrep_on is not allowed if there
+# is no wsrep_provider
+#
+--error ER_WRONG_ARGUMENTS
+SET GLOBAL wsrep_on=ON;
+SELECT @@global.wsrep_on;
diff --git a/sql/wsrep_var.cc b/sql/wsrep_var.cc
@@ -70,6 +70,12 @@ bool wsrep_on_check(sys_var *self, THD* thd, set_var* var)
 	    " innodb_lock_schedule_algorithm=FCFS and restart.", MYF(0));
     return true;
   }
+  if (new_wsrep_on && !WSREP_PROVIDER_EXISTS)
+  {
+    my_message(ER_WRONG_ARGUMENTS, "WSREP (galera) can't be enabled "
+               "if the wsrep_provider is unset or set to 'none'", MYF(0));
+    return true;
+  }
   return false;
 }