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

Remove warning when using ScopedStatementReplication

Browse Source
This commit is contained in:
Monty
2018-05-26 16:26:56 +03:00
parent 3e03b3dc15
commit b3a2761807
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/sql_class.h
View File

@ -4078,6 +4078,16 @@ public:
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");

8
sql/sql_update.cc
View File

@ -2850,14 +2850,16 @@ 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 ||