diff options
Diffstat (limited to 'sql/rpl_gtid.h')
| -rw-r--r-- | sql/rpl_gtid.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/sql/rpl_gtid.h b/sql/rpl_gtid.h index f638a084e38..5dfac7a3c6f 100644 --- a/sql/rpl_gtid.h +++ b/sql/rpl_gtid.h @@ -181,7 +181,7 @@ struct rpl_slave_state bool sort); int tostring(String *dest, rpl_gtid *extra_gtids, uint32 num_extra); bool domain_to_gtid(uint32 domain_id, rpl_gtid *out_gtid); - int load(THD *thd, char *state_from_master, size_t len, bool reset, + int load(THD *thd, const char *state_from_master, size_t len, bool reset, bool in_statement); bool is_empty(); @@ -270,8 +270,12 @@ struct slave_connection_state rpl_gtid gtid; uint32 flags; }; - static const uint32 START_OWN_SLAVE_POS= 0x1; - static const uint32 START_ON_EMPTY_DOMAIN= 0x2; + /* Bits for 'flags' */ + enum start_flags + { + START_OWN_SLAVE_POS= 0x1, + START_ON_EMPTY_DOMAIN= 0x2 + }; /* Mapping from domain_id to the entry with GTID requested for that domain. */ HASH hash; @@ -283,7 +287,7 @@ struct slave_connection_state ~slave_connection_state(); void reset() { my_hash_reset(&hash); } - int load(char *slave_request, size_t len); + int load(const char *slave_request, size_t len); int load(const rpl_gtid *gtid_list, uint32 count); int load(rpl_slave_state *state, rpl_gtid *extra_gtids, uint32 num_extra); rpl_gtid *find(uint32 domain_id); |