diff options
| author | Kristian Nielsen <knielsen@knielsen-hq.org> | 2016-01-15 12:50:23 +0100 |
|---|---|---|
| committer | Kristian Nielsen <knielsen@knielsen-hq.org> | 2016-01-15 12:50:23 +0100 |
| commit | 74b1af19e9270a932f9e5f907eff53852984a7d3 (patch) | |
| tree | 77eb2e71173ac223b13c48a772ad3f5f8a11aa65 /sql/rpl_rli.cc | |
| parent | 3730d8a225fe33a0157e0aaa85121ef7cecf288d (diff) | |
| parent | 06b2e327fcb9ee8737e66cf0893766df41c9d8f8 (diff) | |
| download | mariadb-git-74b1af19e9270a932f9e5f907eff53852984a7d3.tar.gz | |
Merge branch 'tmp' into tmp-10.0
Conflicts:
sql/slave.cc
Diffstat (limited to 'sql/rpl_rli.cc')
| -rw-r--r-- | sql/rpl_rli.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/rpl_rli.cc b/sql/rpl_rli.cc index 422c38209b5..1fc92d4ecec 100644 --- a/sql/rpl_rli.cc +++ b/sql/rpl_rli.cc @@ -389,6 +389,7 @@ Failed to open the existing relay log info file '%s' (errno %d)", if (rli->is_relay_log_recovery && init_recovery(rli->mi, &msg)) goto err; + rli->relay_log_state.load(rpl_global_gtid_slave_state); if (init_relay_log_pos(rli, rli->group_relay_log_name, rli->group_relay_log_pos, @@ -1148,6 +1149,7 @@ int purge_relay_logs(Relay_log_info* rli, THD *thd, bool just_reset, error=1; goto err; } + rli->relay_log_state.load(rpl_global_gtid_slave_state); if (!just_reset) { /* Save name of used relay log file */ |