Commit b3a27618 authored by Monty's avatar Monty

Remove warning when using ScopedStatementReplication

parent 3e03b3dc
Branches unavailable
Tags unavailable
No related merge requests found
...@@ -4078,6 +4078,16 @@ class THD :public Statement, ...@@ -4078,6 +4078,16 @@ class THD :public Statement,
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }
inline enum_binlog_format get_current_stmt_binlog_format()
{
return current_stmt_binlog_format;
}
inline void set_current_stmt_binlog_format(enum_binlog_format format)
{
current_stmt_binlog_format= format;
}
inline void set_current_stmt_binlog_format_row() inline void set_current_stmt_binlog_format_row()
{ {
DBUG_ENTER("set_current_stmt_binlog_format_row"); DBUG_ENTER("set_current_stmt_binlog_format_row");
......
...@@ -2850,17 +2850,19 @@ bool multi_update::send_eof() ...@@ -2850,17 +2850,19 @@ bool multi_update::send_eof()
break; break;
} }
} }
ScopedStatementReplication scoped_stmt_rpl(force_stmt ? thd : NULL); enum_binlog_format save_binlog_format;
save_binlog_format= thd->get_current_stmt_binlog_format();
if (force_stmt)
thd->set_current_stmt_binlog_format_stmt();
if (thd->binlog_query(THD::ROW_QUERY_TYPE, thd->query(), if (thd->binlog_query(THD::ROW_QUERY_TYPE, thd->query(),
thd->query_length(), transactional_tables, FALSE, thd->query_length(), transactional_tables, FALSE,
FALSE, errcode)) FALSE, errcode))
{
local_error= 1; // Rollback update local_error= 1; // Rollback update
} thd->set_current_stmt_binlog_format(save_binlog_format);
} }
} }
DBUG_ASSERT(trans_safe || !updated || DBUG_ASSERT(trans_safe || !updated ||
thd->transaction.stmt.modified_non_trans_table); thd->transaction.stmt.modified_non_trans_table);
if (likely(local_error != 0)) if (likely(local_error != 0))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment