From dced5146bdfc46e200ba35a86c3c55fb60972e33 Mon Sep 17 00:00:00 2001 From: Nirbhay Choubey Date: Tue, 14 Jul 2015 16:05:29 -0400 Subject: Merge branch '10.0-galera' into 10.1 --- sql/wsrep_priv.h | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'sql/wsrep_priv.h') diff --git a/sql/wsrep_priv.h b/sql/wsrep_priv.h index 5c66587d757..30dce78c1a4 100644 --- a/sql/wsrep_priv.h +++ b/sql/wsrep_priv.h @@ -32,22 +32,20 @@ ssize_t wsrep_sst_prepare (void** msg); wsrep_cb_status wsrep_sst_donate_cb (void* app_ctx, void* recv_ctx, const void* msg, size_t msg_len, - const wsrep_gtid_t* current_id, + const wsrep_gtid_t* state_id, const char* state, size_t state_len, bool bypass); -extern unsigned int wsrep_check_ip (const char* addr); -extern size_t wsrep_guess_ip (char* buf, size_t buf_len); -extern size_t wsrep_guess_address(char* buf, size_t buf_len); extern wsrep_uuid_t local_uuid; extern wsrep_seqno_t local_seqno; // a helper function -extern void wsrep_sst_received(wsrep_t*, const wsrep_uuid_t*, wsrep_seqno_t, - const void*, size_t); +void wsrep_sst_received(wsrep_t*, const wsrep_uuid_t&, wsrep_seqno_t, + const void*, size_t); /*! SST thread signals init thread about sst completion */ -extern void wsrep_sst_complete(const wsrep_uuid_t*, wsrep_seqno_t, bool); +void wsrep_sst_complete(const wsrep_uuid_t*, wsrep_seqno_t, bool); void wsrep_notify_status (wsrep_member_status_t new_status, const wsrep_view_info_t* view = 0); + #endif /* WSREP_PRIV_H */ -- cgit v1.2.1