diff options
| author | Monty <monty@mariadb.org> | 2015-07-15 16:27:14 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2015-07-16 10:36:58 +0300 |
| commit | 872a953b228e93553ed056d8fa035ff06e884bc8 (patch) | |
| tree | a90958d21c610b2517705ab79666aacd8c837e84 /sql/slave.h | |
| parent | df0498fd76897c0e034ab3f0598972f0e2419b02 (diff) | |
| download | mariadb-git-872a953b228e93553ed056d8fa035ff06e884bc8.tar.gz | |
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.
Diffstat (limited to 'sql/slave.h')
| -rw-r--r-- | sql/slave.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/slave.h b/sql/slave.h index 15e320623cc..a519229fac1 100644 --- a/sql/slave.h +++ b/sql/slave.h @@ -176,7 +176,8 @@ bool flush_relay_log_info(Relay_log_info* rli); int register_slave_on_master(MYSQL* mysql); int terminate_slave_threads(Master_info* mi, int thread_mask, bool skip_lock = 0); -int start_slave_threads(bool need_slave_mutex, bool wait_for_start, +int start_slave_threads(THD *thd, + bool need_slave_mutex, bool wait_for_start, Master_info* mi, const char* master_info_fname, const char* slave_info_fname, int thread_mask); /* |