diff options
Diffstat (limited to 'sql/log_event_server.cc')
| -rw-r--r-- | sql/log_event_server.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/log_event_server.cc b/sql/log_event_server.cc index c16ca88fea0..7a8561051ba 100644 --- a/sql/log_event_server.cc +++ b/sql/log_event_server.cc @@ -1912,6 +1912,13 @@ int Query_log_event::do_apply_event(rpl_group_info *rgi, thd->update_server_status(); log_slow_statement(thd); thd->lex->restore_set_statement_var(); + + /* + When THD::slave_expected_error gets reset inside execution stack + that is the case of to be ignored event. In this case the expected + error must change to the reset value as well. + */ + expected_error= thd->slave_expected_error; } thd->variables.option_bits&= ~OPTION_MASTER_SQL_ERROR; |