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

Merge 10.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2021-03-18 15:46:28 +02:00
parent 7887d45352 190a8312f5
commit ccfbeafc45
43 changed files with 944 additions and 2004 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
sql/sql_parse.cc
View File

@ -3633,6 +3633,11 @@ mysql_execute_command(THD *thd)
Json_writer_object trace_command(thd);
Json_writer_array trace_command_steps(thd, "steps");
/* store old value of binlog format */
enum_binlog_format orig_binlog_format,orig_current_stmt_binlog_format;
thd->get_binlog_format(&orig_binlog_format,
&orig_current_stmt_binlog_format);
#ifdef WITH_WSREP
if (WSREP(thd))
{
@ -3684,12 +3689,6 @@ mysql_execute_command(THD *thd)
DBUG_ASSERT(thd->transaction->stmt.modified_non_trans_table == FALSE);
/* store old value of binlog format */
enum_binlog_format orig_binlog_format,orig_current_stmt_binlog_format;
thd->get_binlog_format(&orig_binlog_format,
&orig_current_stmt_binlog_format);
/*
Assign system variables with values specified by the clause
SET STATEMENT var1=value1 [, var2=value2, ...] FOR <statement>
@ -7582,9 +7581,14 @@ void THD::reset_for_next_command(bool do_clear_error)
save_prep_leaf_list= false;
DBUG_PRINT("debug",
("is_current_stmt_binlog_format_row(): %d",
is_current_stmt_binlog_format_row()));
#ifdef WITH_WSREP
#if !defined(DBUG_OFF)
if (mysql_bin_log.is_open())
#endif
#endif
DBUG_PRINT("debug",
("is_current_stmt_binlog_format_row(): %d",
is_current_stmt_binlog_format_row()));
DBUG_VOID_RETURN;
}