Merge 10.6 into 10.7

Author: dr-m

libmariadb

@@ -475,7 +475,7 @@ void upgrade_lock_type(THD *thd, thr_lock_type *lock_type,
  }
 
  bool log_on= (thd->variables.option_bits & OPTION_BIN_LOG);
- if (thd->wsrep_binlog_format() == BINLOG_FORMAT_STMT &&
+ if (WSREP_BINLOG_FORMAT(global_system_variables.binlog_format) == BINLOG_FORMAT_STMT &&
  log_on && mysql_bin_log.is_open())
  {
  /*

sql/sql_insert.cc

@@ -104,7 +104,7 @@ long wsrep_slave_threads; // No. of slave appliers threads
 ulong wsrep_retry_autocommit; // Retry aborted autocommit trx
 ulong wsrep_max_ws_size; // Max allowed ws (RBR buffer) size
 ulong wsrep_max_ws_rows; // Max number of rows in ws
-ulong wsrep_forced_binlog_format;
+ulong wsrep_forced_binlog_format= BINLOG_FORMAT_UNSPEC;
 ulong wsrep_mysql_replication_bundle;
 
 bool wsrep_gtid_mode; // Enable WSREP native GTID support