diff options
| author | unknown <knielsen@knielsen-hq.org> | 2011-04-01 15:07:10 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2011-04-01 15:07:10 +0200 |
| commit | c677fea7d01ef1fab3357496b309a3e3b3c00dfe (patch) | |
| tree | b6000be3447e5a41440cffee8b8d927d37a1dcde /sql/slave.h | |
| parent | 09bd2894973fbdbacec9bfc31a3635165b120200 (diff) | |
| parent | 9aa44bb4b3e0fc69306626b961c7d9309e6ab114 (diff) | |
| download | mariadb-git-c677fea7d01ef1fab3357496b309a3e3b3c00dfe.tar.gz | |
Merge MariaDB 5.2.5 release into MariaDB-5.2-rpl.
Diffstat (limited to 'sql/slave.h')
| -rw-r--r-- | sql/slave.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/slave.h b/sql/slave.h index 63dd3afc6b8..3333e583559 100644 --- a/sql/slave.h +++ b/sql/slave.h @@ -191,7 +191,7 @@ int purge_relay_logs(Relay_log_info* rli, THD *thd, bool just_reset, const char** errmsg); void set_slave_thread_options(THD* thd); void set_slave_thread_default_charset(THD *thd, Relay_log_info const *rli); -void rotate_relay_log(Master_info* mi); +int rotate_relay_log(Master_info* mi); int apply_event_and_update_pos(Log_event* ev, THD* thd, Relay_log_info* rli); pthread_handler_t handle_slave_io(void *arg); |