Commit b0d716a5 authored by unknown's avatar unknown

Post-merge fixes.

parent 1fa7eb82
...@@ -1991,7 +1991,7 @@ void THD::reset_sub_statement_state(Sub_statement_state *backup, ...@@ -1991,7 +1991,7 @@ void THD::reset_sub_statement_state(Sub_statement_state *backup,
INSERT INTO t1 VALUES (1), (foo()), (2); INSERT INTO t1 VALUES (1), (foo()), (2);
*/ */
if (binlog_row_based) if (binlog_row_based)
thd->binlog_flush_pending_rows_event(false); binlog_flush_pending_rows_event(false);
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