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

Merge branch '10.10' into 10.11

Browse Source
This commit is contained in:
Oleksandr Byelkin
2023-11-08 16:46:47 +01:00
parent 818a9f38b6 04d9a46c41
commit fecd78b837
560 changed files with 13069 additions and 8461 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_insert.cc
View File

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