database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge 10.6 into 10.7

Browse Source
This commit is contained in:
Marko Mäkelä
2021-10-06 10:28:59 +03:00
parent b7ff385d43 41c66ef6f7
commit 25921c997e
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libmariadb

Submodule libmariadb updated: 8574d0b840...5cd74de9f1

2
sql/sql_insert.cc
View File

@ -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); 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()) log_on && mysql_bin_log.is_open())
{ {
/* /*

2
sql/wsrep_mysqld.cc
View File

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