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 /mysql-test | |
| 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 'mysql-test')
| -rw-r--r-- | mysql-test/r/rpl_incident.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/rpl_incident.result b/mysql-test/r/rpl_incident.result index 5becaf37068..70086c1e848 100644 --- a/mysql-test/r/rpl_incident.result +++ b/mysql-test/r/rpl_incident.result @@ -47,7 +47,7 @@ Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table -Last_Errno 1583 +Last_Errno 1586 Last_Error The incident LOST_EVENTS occured on the master. Message: <none> Skip_Counter 0 Exec_Master_Log_Pos # |