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

Merge branch '10.6' into 10.11

Browse Source
This commit is contained in:
Oleksandr Byelkin
2024-07-04 11:52:07 +02:00
parent f6989d1767 8ed3c37592
commit 034a175982
187 changed files with 4678 additions and 4362 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_class.cc
View File

@@ -5052,6 +5052,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;
}
@@ -6401,7 +6404,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 "