diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-07 08:26:21 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-07 08:26:21 +0300 |
| commit | 38d36b59f925dc19f5b8346b3e54bec782771967 (patch) | |
| tree | 2a7aa642243541497db4f11a4ba5f893353c1701 /sql/log_event_server.cc | |
| parent | 38dda1f026fa9ff449950b4497b6bde04dc28734 (diff) | |
| parent | c7ba2377936be2a3c84080359d87f7486ce682a0 (diff) | |
| download | mariadb-git-38d36b59f925dc19f5b8346b3e54bec782771967.tar.gz | |
Merge 10.4 into 10.5
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; |