diff options
| author | mkaruza <mario.karuza@galeracluster.com> | 2021-10-05 13:01:31 +0200 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2021-10-06 07:20:02 +0300 |
| commit | a75813d46739f1e3aea9821b163c0ff1332a017e (patch) | |
| tree | edb2ce2a70d173ccef1d7a33f55df2077845ba7f | |
| parent | 097b7b8c9e7f5900842a329286882f55aa42f27e (diff) | |
| download | mariadb-git-a75813d46739f1e3aea9821b163c0ff1332a017e.tar.gz | |
MDEV-22708 Assertion `!mysql_bin_log.is_open() || thd.is_current_stmt_binlog_format_row()' failed in Delayed_insert::handle_inserts and in Diagnostics_area::set_eof_status
Function `upgrade_lock_type` should check global binlog_format variable
instead of thread one.
Reviewed-by: Jan Lindström <jan.lindstrom@mariadb.com>
| -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 4dd0ec3375b..f34632b3df8 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -474,7 +474,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 55564dbe235..74015fdee28 100644 --- a/sql/wsrep_mysqld.cc +++ b/sql/wsrep_mysqld.cc @@ -105,7 +105,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; // Use wsrep_gtid_domain_id // for galera transactions? |