diff options
| author | Sujatha Sivakumar <sujatha.sivakumar@oracle.com> | 2016-05-13 16:42:45 +0530 |
|---|---|---|
| committer | Prashant Tekriwal <prashant.tekriwal@oracle.com> | 2016-05-16 11:34:20 +0200 |
| commit | ef3f09f0c9e62ea1bf86b33b5d97e954b3ae34fe (patch) | |
| tree | e5e133ed139581968188e0800606ed0c9867f311 /sql/slave.h | |
| parent | 9d72fb4af0d87f6a69a3ccb9202b4029acf2bd56 (diff) | |
| download | mariadb-git-ef3f09f0c9e62ea1bf86b33b5d97e954b3ae34fe.tar.gz | |
Bug#23251517: SEMISYNC REPLICATION HANGINGmysql-5.5.50
Revert following bug fix:
Bug#20685029: SLAVE IO THREAD SHOULD STOP WHEN DISK IS
FULL
Bug#21753696: MAKE SHOW SLAVE STATUS NON BLOCKING IF IO
THREAD WAITS FOR DISK SPACE
This fix results in a deadlock between slave IO thread
and SQL thread.
(cherry picked from commit e3fea6c6dbb36c6ab21c4ab777224560e9608b53)
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 0cf8adb0315..7bf136694cc 100644 --- a/sql/slave.h +++ b/sql/slave.h @@ -205,7 +205,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); -int rotate_relay_log(Master_info* mi, bool need_data_lock); +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); |