From 872a953b228e93553ed056d8fa035ff06e884bc8 Mon Sep 17 00:00:00 2001 From: Monty Date: Wed, 15 Jul 2015 16:27:14 +0300 Subject: MDEV-8469 Add RESET MASTER TO x to allow specification of binlog file nr Other things: - Avoid calling init_and_set_log_file_name() when opening binary log. - Remove newlines early when reading from index file. - Ensure that reset_logs() will work even if thd is 0 (Can happen on startup) - Added thd to sart_slave_threads() for better error handling. --- sql/sql_repl.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'sql/sql_repl.h') diff --git a/sql/sql_repl.h b/sql/sql_repl.h index a9fdce9e5e2..774e43c0a87 100644 --- a/sql/sql_repl.h +++ b/sql/sql_repl.h @@ -46,7 +46,8 @@ int stop_slave(THD* thd, Master_info* mi, bool net_report); bool change_master(THD* thd, Master_info* mi, bool *master_info_added); bool mysql_show_binlog_events(THD* thd); int reset_slave(THD *thd, Master_info* mi); -int reset_master(THD* thd, rpl_gtid *init_state, uint32 init_state_len); +int reset_master(THD* thd, rpl_gtid *init_state, uint32 init_state_len, + ulong next_log_number); bool purge_master_logs(THD* thd, const char* to_log); bool purge_master_logs_before_date(THD* thd, time_t purge_time); bool log_in_use(const char* log_name); -- cgit v1.2.1