diff --git a/libmariadb b/libmariadb index 8574d0b840d..5cd74de9f13 160000 --- a/libmariadb +++ b/libmariadb @@ -1 +1 @@ -Subproject commit 8574d0b840df8e5b1bf64030f5d94ea9bd540e66 +Subproject commit 5cd74de9f1338765f4d883c2ad5b96a8b446765a diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index b5bc0c037ad..3f753c8bbb1 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -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()) { /* diff --git a/sql/wsrep_mysqld.cc b/sql/wsrep_mysqld.cc index 89823cea3bf..45ef011e6d2 100644 --- a/sql/wsrep_mysqld.cc +++ b/sql/wsrep_mysqld.cc @@ -108,7 +108,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