database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

WL#3464 (Add replication event to denote gap in replication):

Browse Source 
Fixing automerge problem and updating comments referring to exec_event().
This commit is contained in:
mats@romeo.(none)
2007-03-30 15:29:30 +02:00
parent 121f29a541
commit 4710d3df33
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/rpl_incident.result
View File

@@ -47,7 +47,7 @@ Replicate_Do_Table
Replicate_Ignore_Table Replicate_Ignore_Table
Replicate_Wild_Do_Table Replicate_Wild_Do_Table
Replicate_Wild_Ignore_Table Replicate_Wild_Ignore_Table
Last_Errno 1583 Last_Errno 1586
Last_Error The incident LOST_EVENTS occured on the master. Message: <none> Last_Error The incident LOST_EVENTS occured on the master. Message: <none>
Skip_Counter 0 Skip_Counter 0
Exec_Master_Log_Pos # Exec_Master_Log_Pos #

4
sql/log_event.cc
View File

@@ -7956,9 +7956,9 @@ Incident_log_event::print(FILE *file,
#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT) #if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
int int
Incident_log_event::exec_event(st_relay_log_info *rli) Incident_log_event::do_apply_event(RELAY_LOG_INFO const *rli)
{ {
DBUG_ENTER("Incident_log_event::exec_event"); DBUG_ENTER("Incident_log_event::do_apply_event");
slave_print_msg(ERROR_LEVEL, rli, ER_SLAVE_INCIDENT, slave_print_msg(ERROR_LEVEL, rli, ER_SLAVE_INCIDENT,
ER(ER_SLAVE_INCIDENT), ER(ER_SLAVE_INCIDENT),
description(), description(),

2
sql/log_event.h
View File

@@ -2588,7 +2588,7 @@ public:
#endif #endif
#if !defined(MYSQL_CLIENT) && defined(HAVE_REPLICATION) #if !defined(MYSQL_CLIENT) && defined(HAVE_REPLICATION)
virtual int exec_event(struct st_relay_log_info *rli); virtual int do_apply_event(RELAY_LOG_INFO const *rli);
#endif #endif
virtual bool write_data_header(IO_CACHE *file); virtual bool write_data_header(IO_CACHE *file);

6
sql/rpl_rli.cc
View File

@@ -969,7 +969,7 @@ err:
strtol() conversions needed for log names comparison. We don't need to 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 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 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 rare, so caching gives real benifit), and if we have UNTIL_RELAY_POS
condition then we should invalidate cached comarison value after condition then we should invalidate cached comarison value after
inc_group_relay_log_pos() which called for each group of events (so we 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); 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 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 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 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. 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. 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 3) If finding a Format_description_log_event after a BEGIN, we also need
to rollback before continuing with the next events. to rollback before continuing with the next events.

2
sql/sql_class.h
View File

@@ -1270,7 +1270,7 @@ public:
return first_successful_insert_id_in_prev_stmt; return first_successful_insert_id_in_prev_stmt;
} }
/* /*
Used by Intvar_log_event::exec_event() and by "SET INSERT_ID=#" Used by Intvar_log_event::do_apply_event() and by "SET INSERT_ID=#"
(mysqlbinlog). We'll soon add a variant which can take many intervals in (mysqlbinlog). We'll soon add a variant which can take many intervals in
argument. argument.
*/ */