diff options
| author | unknown <mats@romeo.(none)> | 2007-03-30 15:29:30 +0200 |
|---|---|---|
| committer | unknown <mats@romeo.(none)> | 2007-03-30 15:29:30 +0200 |
| commit | ccc65d8eb5dbe4bb260e07b261c0c976952d0dac (patch) | |
| tree | 71fa810b79e5310fdc25ae842c17f8c4adcbfb15 /sql/rpl_rli.cc | |
| parent | 03b4cf5147aaa6f5e8d5ba659f9342639598d9b1 (diff) | |
| download | mariadb-git-ccc65d8eb5dbe4bb260e07b261c0c976952d0dac.tar.gz | |
WL#3464 (Add replication event to denote gap in replication):
Fixing automerge problem and updating comments referring to exec_event().
mysql-test/r/rpl_incident.result:
Result change
sql/log_event.cc:
Renaming exec_event() to do_apply_event().
sql/log_event.h:
Renaming exec_event() to do_apply_event().
sql/rpl_rli.cc:
Fixing comments referring to exec_event(), which does not exist any more.
sql/sql_class.h:
Fixing comments referring to exec_event(), which does not exist any more.
Diffstat (limited to 'sql/rpl_rli.cc')
| -rw-r--r-- | sql/rpl_rli.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/rpl_rli.cc b/sql/rpl_rli.cc index 16e13f049e3..b0db355154e 100644 --- a/sql/rpl_rli.cc +++ b/sql/rpl_rli.cc @@ -969,7 +969,7 @@ err: strtol() conversions needed for log names comparison. We don't need to compare them each time this function is called, we only need to do this when current log name changes. If we have UNTIL_MASTER_POS condition we - need to do this only after Rotate_log_event::exec_event() (which is + need to do this only after Rotate_log_event::do_apply_event() (which is rare, so caching gives real benifit), and if we have UNTIL_RELAY_POS condition then we should invalidate cached comarison value after inc_group_relay_log_pos() which called for each group of events (so we @@ -1093,12 +1093,12 @@ void st_relay_log_info::cleanup_context(THD *thd, bool error) DBUG_ASSERT(sql_thd == thd); /* - 1) Instances of Table_map_log_event, if ::exec_event() was called on them, + 1) Instances of Table_map_log_event, if ::do_apply_event() was called on them, may have opened tables, which we cannot be sure have been closed (because maybe the Rows_log_event have not been found or will not be, because slave SQL thread is stopping, or relay log has a missing tail etc). So we close all thread's tables. And so the table mappings have to be cancelled. - 2) Rows_log_event::exec_event() may even have started statements or + 2) Rows_log_event::do_apply_event() may even have started statements or transactions on them, which we need to rollback in case of error. 3) If finding a Format_description_log_event after a BEGIN, we also need to rollback before continuing with the next events. |