database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge remote-tracking branch 'origin/11.5' into 11.6

Browse Source
This commit is contained in:
Alexander Barkov
2024-07-10 13:30:01 +04:00
parent 186a1afe63 4e805aed85
commit a2a5ba14a8
642 changed files with 14615 additions and 11268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_class.cc
View File

@@ -5186,6 +5186,9 @@ MYSQL_THD create_background_thd()
thd->real_id= 0;
thd->thread_id= 0;
thd->query_id= 0;
#ifdef WITH_WSREP
thd->variables.wsrep_on= FALSE;
#endif /* WITH_WSREP */
return thd;
}
@@ -6581,7 +6584,8 @@ int THD::decide_logging_format(TABLE_LIST *tables)
wsrep_is_active(this) &&
variables.wsrep_trx_fragment_size > 0)
{
if (!is_current_stmt_binlog_format_row())
if (!is_current_stmt_binlog_disabled() &&
!is_current_stmt_binlog_format_row())
{
my_message(ER_NOT_SUPPORTED_YET,
"Streaming replication not supported with "