diff options
| author | <Dao-Gang.Qu@sun.com> | 2009-10-14 09:39:05 +0800 |
|---|---|---|
| committer | <Dao-Gang.Qu@sun.com> | 2009-10-14 09:39:05 +0800 |
| commit | 0ece5891a28d9e7f8387573a4c69f2c278edd225 (patch) | |
| tree | e6614a71219b99d66068dcb6d5cf7ab23c031151 /sql/slave.h | |
| parent | 16853758126b26c8707af8c23c40d691989ff7fe (diff) | |
| download | mariadb-git-0ece5891a28d9e7f8387573a4c69f2c278edd225.tar.gz | |
Bug#46640: output from mysqlbinlog command in 5.1 breaks replication
The BINLOG statement was sharing too much code with the slave SQL thread, introduced with
the patch for Bug#32407. This caused statements to be logged with the wrong server_id, the
id stored inside the events of the BINLOG statement rather than the id of the running
server.
Fix by rearranging code a bit so that only relevant parts of the code are executed by
the BINLOG statement, and the server_id of the server executing the statements will
not be overrided by the server_id stored in the 'format description BINLOG statement'.
Diffstat (limited to 'sql/slave.h')
| -rw-r--r-- | sql/slave.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/slave.h b/sql/slave.h index a44a7eed83e..f356d28b626 100644 --- a/sql/slave.h +++ b/sql/slave.h @@ -190,8 +190,7 @@ int purge_relay_logs(Relay_log_info* rli, THD *thd, bool just_reset, 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 apply_event_and_update_pos(Log_event* ev, THD* thd, Relay_log_info* rli, - bool skip); +int apply_event_and_update_pos(Log_event* ev, THD* thd, Relay_log_info* rli); pthread_handler_t handle_slave_io(void *arg); pthread_handler_t handle_slave_sql(void *arg); |