diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-06 09:45:12 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-06 09:45:12 +0300 |
| commit | 4eb7217ec33fef8d23f2dda0c97b442508c81b1d (patch) | |
| tree | 26dc0f3b37474c29b0b0f09991e50cfef19d70e7 | |
| parent | 48f1b6946ee24e4fe514698ab591fc6814fc62b0 (diff) | |
| parent | a75813d46739f1e3aea9821b163c0ff1332a017e (diff) | |
| download | mariadb-git-4eb7217ec33fef8d23f2dda0c97b442508c81b1d.tar.gz | |
Merge 10.4 into 10.5
| -rw-r--r-- | sql/sql_insert.cc | 2 | ||||
| -rw-r--r-- | sql/wsrep_mysqld.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 3c3fcc807f2..3ef13ea2e1d 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 7661dab2b8a..560db53d16e 100644 --- a/sql/wsrep_mysqld.cc +++ b/sql/wsrep_mysqld.cc @@ -106,7 +106,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 |