1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-05 13:16:09 +03:00

Merge branch '11.5' into 11.6

This commit is contained in:
Oleksandr Byelkin
2024-08-21 13:28:32 +02:00
107 changed files with 2996 additions and 316 deletions

View File

@@ -6670,6 +6670,24 @@ int THD::decide_logging_format(TABLE_LIST *tables)
}
set_current_stmt_binlog_format_row();
}
/* If user has requested binlog_format STMT OR MIXED
in CREATE TABLE [SELECT|REPLACE] we will fall back
to ROW.
Note that we can't use local binlog_format variable
here because wsrep_binlog_format sets it to ROW.
*/
if (wsrep_ctas && variables.binlog_format != BINLOG_FORMAT_ROW)
{
push_warning_printf(this, Sql_condition::WARN_LEVEL_WARN,
ER_UNKNOWN_ERROR,
"Galera does not support binlog_format = %s "
"in CREATE TABLE [SELECT|REPLACE] forcing ROW",
binlog_format == BINLOG_FORMAT_STMT ?
"STMT" : "MIXED");
set_current_stmt_binlog_format_row();
}
#endif /* WITH_WSREP */
if (WSREP_EMULATE_BINLOG_NNULL(this) ||