From b3925982a064d79d6f2cf57f532f143d36cfc004 Mon Sep 17 00:00:00 2001
From: Julius Goryavsky <julius.goryavsky@mariadb.com>
Date: Tue, 2 May 2023 04:57:30 +0200
Subject: [PATCH] MDEV-29755 post-merge for 10.6+

1) remove unnecessary restriction on changing mode;
2) adding lost wsrep_replicate_myisam_basic test.
---
 .../r/wsrep_replicate_myisam_basic.result     | 15 +++++++++++++++
 .../t/wsrep_replicate_myisam_basic.test       | 19 +++++++++++++++++++
 sql/wsrep_var.cc                              |  6 ------
 3 files changed, 34 insertions(+), 6 deletions(-)
 create mode 100644 mysql-test/suite/sys_vars/r/wsrep_replicate_myisam_basic.result
 create mode 100644 mysql-test/suite/sys_vars/t/wsrep_replicate_myisam_basic.test

diff --git a/mysql-test/suite/sys_vars/r/wsrep_replicate_myisam_basic.result b/mysql-test/suite/sys_vars/r/wsrep_replicate_myisam_basic.result
new file mode 100644
index 00000000000..c8effa8c0f3
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/wsrep_replicate_myisam_basic.result
@@ -0,0 +1,15 @@
+#
+# wsrep_replicate_myisam
+#
+# save the initial value
+SET @wsrep_mode_saved = @@global.wsrep_mode;
+
+# scope and valid values
+SET @@global.wsrep_mode=REPLICATE_MYISAM;
+SELECT @@global.wsrep_mode;
+@@global.wsrep_mode
+REPLICATE_MYISAM
+
+# restore the initial value
+SET @@global.wsrep_mode = @wsrep_mode_saved;
+# End of test
diff --git a/mysql-test/suite/sys_vars/t/wsrep_replicate_myisam_basic.test b/mysql-test/suite/sys_vars/t/wsrep_replicate_myisam_basic.test
new file mode 100644
index 00000000000..49ccdec047a
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/wsrep_replicate_myisam_basic.test
@@ -0,0 +1,19 @@
+--source include/have_wsrep.inc
+
+--echo #
+--echo # wsrep_replicate_myisam
+--echo #
+
+--echo # save the initial value
+SET @wsrep_mode_saved = @@global.wsrep_mode;
+
+--echo
+--echo # scope and valid values
+SET @@global.wsrep_mode=REPLICATE_MYISAM;
+SELECT @@global.wsrep_mode;
+
+--echo
+--echo # restore the initial value
+SET @@global.wsrep_mode = @wsrep_mode_saved;
+
+--echo # End of test
diff --git a/sql/wsrep_var.cc b/sql/wsrep_var.cc
index ce679d245ba..3d381afa704 100644
--- a/sql/wsrep_var.cc
+++ b/sql/wsrep_var.cc
@@ -985,12 +985,6 @@ bool wsrep_max_ws_size_update(sys_var *self, THD *thd, enum_var_type)
 bool wsrep_mode_check(sys_var *self, THD* thd, set_var* var)
 {
   ulonglong new_wsrep_mode= var->save_result.ulonglong_value;
-  if (new_wsrep_mode && !WSREP_ON)
-  {
-    my_message(ER_WRONG_ARGUMENTS, "wsrep_mode can't be set "
-               "if wsrep_on=OFF", MYF(0));
-    return true;
-  }
   ulonglong old_wsrep_mode= wsrep_mode;
   wsrep_mode= new_wsrep_mode;
   if (wsrep_check_mode(WSREP_MODE_REPLICATE_MYISAM) ||