diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-07 08:08:59 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-07 08:08:59 +0300 |
| commit | c7ba2377936be2a3c84080359d87f7486ce682a0 (patch) | |
| tree | d5baefb80899dabbe5d3fcac421727409ba15c12 /sql/log_event.cc | |
| parent | 2917bd0d2cf417cbf9c83b64ae2b7806bdb2f34e (diff) | |
| parent | ac49b7a845f5b5de30d1266879a4c584f9d7c914 (diff) | |
| download | mariadb-git-c7ba2377936be2a3c84080359d87f7486ce682a0.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/log_event.cc')
| -rw-r--r-- | sql/log_event.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index 0749bc1ec0d..1d32760c084 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -5740,6 +5740,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; |