MDEV-7322: Option to allow setting the binlog_format with Galera

At session scope, allow binlog_format to be changed to
values other than ROW with a warning.

1 files changed, 8 insertions, 5 deletions

diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc
index b8c750061a6..b796b1445e4 100644
--- a/sql/sys_vars.cc
+++ b/sql/sys_vars.cc
@@ -287,14 +287,17 @@ static bool binlog_format_check(sys_var *self, THD *thd, set_var *var)
   if (WSREP(thd) &&
       var->save_result.ulonglong_value != BINLOG_FORMAT_ROW)
   {
-    WSREP_ERROR("MariaDB Galera does not support binlog format: %s",
-                binlog_format_names[var->save_result.ulonglong_value]);
-
-    // Also push a warning because error message is general.
+    // Push a warning to the error log.
     push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN, ER_UNKNOWN_ERROR,
                         "MariaDB Galera does not support binlog format: %s",
                         binlog_format_names[var->save_result.ulonglong_value]);
-    return true;
+
+    if (var->type == OPT_GLOBAL)
+    {
+      WSREP_ERROR("MariaDB Galera does not support binlog format: %s",
+                  binlog_format_names[var->save_result.ulonglong_value]);
+      return true;
+    }
   }
 #endif