diff options
author | Kristian Nielsen <knielsen@knielsen-hq.org> | 2016-09-22 13:36:45 +0200 |
---|---|---|
committer | Kristian Nielsen <knielsen@knielsen-hq.org> | 2016-10-14 23:15:59 +0200 |
commit | b2bc6dadeeaa16fc7da845cfbeb8bb61042683ac (patch) | |
tree | ccee79b38203f53313f567d66aef29e0d55279b6 /sql/log_event.cc | |
parent | a9fb480fd614031e2e372b1fb8d7e4c858954ac6 (diff) | |
download | mariadb-git-b2bc6dadeeaa16fc7da845cfbeb8bb61042683ac.tar.gz |
MDEV-7145: Delayed replication, cleanup some code
The original MySQL patch left some refactoring todo's, possibly
because of known conflicts with other parallel development (like
info-repository feature perhaps).
This patch fixes those todos/refactorings.
Signed-off-by: Kristian Nielsen <knielsen@knielsen-hq.org>
Diffstat (limited to 'sql/log_event.cc')
-rw-r--r-- | sql/log_event.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index bd8ae984c2d..f6b129d34b2 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -6402,7 +6402,7 @@ bool Rotate_log_event::write() The NOTES below is a wrong comment which will disappear when 4.1 is merged. This must only be called from the Slave SQL thread, since it calls - flush_relay_log_info(). + Relay_log_info::flush(). @retval 0 ok @@ -6457,7 +6457,7 @@ int Rotate_log_event::do_update_pos(rpl_group_info *rgi) (ulong) rli->group_master_log_pos)); mysql_mutex_unlock(&rli->data_lock); rpl_global_gtid_slave_state->record_and_update_gtid(thd, rgi); - flush_relay_log_info(rli); + rli->flush(); /* Reset thd->variables.option_bits and sql_mode etc, because this could @@ -8228,7 +8228,7 @@ void Stop_log_event::print(FILE* file, PRINT_EVENT_INFO* print_event_info) here, the master was sane. This must only be called from the Slave SQL thread, since it calls - flush_relay_log_info(). + Relay_log_info::flush(). */ int Stop_log_event::do_update_pos(rpl_group_info *rgi) @@ -8248,7 +8248,7 @@ int Stop_log_event::do_update_pos(rpl_group_info *rgi) { rpl_global_gtid_slave_state->record_and_update_gtid(thd, rgi); rli->inc_group_relay_log_pos(0, rgi); - flush_relay_log_info(rli); + rli->flush(); } DBUG_RETURN(0); } |