mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 14:54:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
into  mysql.com:/users/lthalmann/bkroot/mysql-5.1-new
This commit is contained in:
lars@mysql.com 2006-01-04 16:27:57 +01:00
commit a48773b62a
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sql/sql_class.cc
View file

@ -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,
*/ */
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)