diff options
author | Michael Widenius <monty@askmonty.org> | 2013-10-15 00:17:16 +0300 |
---|---|---|
committer | Michael Widenius <monty@askmonty.org> | 2013-10-15 00:17:16 +0300 |
commit | 5748eb3ec63adee035ec5305796bdbc67a654158 (patch) | |
tree | dbe4b5bff464a97acfd4cc99f49086b1a9ec227a /sql/log_event_old.cc | |
parent | 2842f6b5dc254c82aa3dc976cd5bd3645dc82a60 (diff) | |
download | mariadb-git-5748eb3ec63adee035ec5305796bdbc67a654158.tar.gz |
Moved the remaining variables, that depends on sql execution, from Relay_log_info to rpl_group_info:
-row_stmt_start_timestamp
-last_event_start_time
-long_find_row_note
-trans_retries
Added slave_executed_entries_lock to protect rli->executed_entries
Added primitives for thread safe 64 bit increment
Update rli->executed_entries when event has executed, not when event has been sent to sql execution thread
sql/log_event.cc:
row_stmt_start and long_find_row_note is now in rpl_group_info
sql/mysqld.cc:
Added slave_executed_entries_lock to protect rli->executed_entries
sql/mysqld.h:
Added slave_executed_entries_lock to protect rli->executed_entries
Added primitives for thread safe 64 bit increment
sql/rpl_parallel.cc:
Update rli->executed_entries when event has executed, not when event has been sent to sql execution thread
sql/rpl_rli.cc:
Moved row_stmt_start_timestamp, last_event_start_time and long_find_row_note from Relay_log_info to rpl_group_info
sql/rpl_rli.h:
Moved trans_retries, row_stmt_start_timestamp, last_event_start_time and long_find_row_note from Relay_log_info to rpl_group_info
sql/slave.cc:
Use rgi for trans_retries and last_event_start_time
Update rli->executed_entries when event has executed, not when event has been sent to sql execution thread
Reset trans_retries when object is created
Diffstat (limited to 'sql/log_event_old.cc')
-rw-r--r-- | sql/log_event_old.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/log_event_old.cc b/sql/log_event_old.cc index b4f28abcf2b..174219a8e72 100644 --- a/sql/log_event_old.cc +++ b/sql/log_event_old.cc @@ -1740,7 +1740,7 @@ int Old_rows_log_event::do_apply_event(rpl_group_info *rgi) problem. When WL#2975 is implemented, just remove the member Relay_log_info::last_event_start_time and all its occurrences. */ - const_cast<Relay_log_info*>(rli)->last_event_start_time= my_time(0); + rgi->last_event_start_time= my_time(0); } if (get_flags(STMT_END_F)) |