diff options
| author | Kristian Nielsen <knielsen@knielsen-hq.org> | 2015-03-04 13:48:28 +0100 |
|---|---|---|
| committer | Kristian Nielsen <knielsen@knielsen-hq.org> | 2015-03-04 13:49:37 +0100 |
| commit | 95d72088596c9c58c30ab87781061094309b4460 (patch) | |
| tree | 52cbad4ea5bbe4c01c5e88a9efde3a05edd37107 /sql/rpl_gtid.h | |
| parent | f4f37533a09b9776e8d5ac3f3a27957f553c9043 (diff) | |
| parent | 78c74dbe30d3a22feec5d069c7424d5a8a86ea4c (diff) | |
| download | mariadb-git-95d72088596c9c58c30ab87781061094309b4460.tar.gz | |
Merge MDEV-6589 and MDEV-6403 into 10.1.
Conflicts:
sql/log.cc
sql/rpl_rli.cc
sql/sql_repl.cc
Diffstat (limited to 'sql/rpl_gtid.h')
| -rw-r--r-- | sql/rpl_gtid.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/rpl_gtid.h b/sql/rpl_gtid.h index bd58d091a02..98f6c505dac 100644 --- a/sql/rpl_gtid.h +++ b/sql/rpl_gtid.h @@ -241,6 +241,7 @@ struct rpl_binlog_state void reset(); void free(); bool load(struct rpl_gtid *list, uint32 count); + bool load(rpl_slave_state *slave_pos); int update_nolock(const struct rpl_gtid *gtid, bool strict); int update(const struct rpl_gtid *gtid, bool strict); int update_with_next_gtid(uint32 domain_id, uint32 server_id, @@ -296,6 +297,7 @@ struct slave_connection_state int to_string(String *out_str); int append_to_string(String *out_str); int get_gtid_list(rpl_gtid *gtid_list, uint32 list_size); + bool is_pos_reached(); }; |