Skip to content

M
MariaDB
Commit a48773b6 authored by lars@mysql.com's avatar lars@mysql.com
Browse files
Options

Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  mysql.com:/users/lthalmann/bkroot/mysql-5.1-new
parents d75a9f53 9e24aede
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
sql/sql_class.cc
View file @ a48773b6
...@@ -1976,6 +1976,7 @@ void THD::reset_sub_statement_state(Sub_statement_state *backup, ...@@ -1976,6 +1976,7 @@ void THD::reset_sub_statement_state(Sub_statement_state *backup,
backup->client_capabilities= client_capabilities; backup->client_capabilities= client_capabilities;
backup->savepoints= transaction.savepoints; backup->savepoints= transaction.savepoints;
#ifdef HAVE_ROW_BASED_REPLICATION
/* /*
For row-based replication and before executing a function/trigger, For row-based replication and before executing a function/trigger,
the pending rows event has to be flushed. The function/trigger the pending rows event has to be flushed. The function/trigger
...@@ -1992,6 +1993,7 @@ void THD::reset_sub_statement_state(Sub_statement_state *backup, ...@@ -1992,6 +1993,7 @@ void THD::reset_sub_statement_state(Sub_statement_state *backup,
*/ */
if (binlog_row_based) if (binlog_row_based)
binlog_flush_pending_rows_event(false); binlog_flush_pending_rows_event(false);
#endif /* HAVE_ROW_BASED_REPLICATION */
if ((!lex->requires_prelocking() || is_update_query(lex->sql_command)) && if ((!lex->requires_prelocking() || is_update_query(lex->sql_command)) &&
!binlog_row_based) !binlog_row_based)
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7