diff options
| author | Seppo Jaakola <seppo.jaakola@codership.com> | 2012-08-30 12:22:37 +0300 |
|---|---|---|
| committer | Seppo Jaakola <seppo.jaakola@codership.com> | 2012-08-30 12:22:37 +0300 |
| commit | 8e84b9e740ff3641f1fc500a616962cb3bc75a64 (patch) | |
| tree | ac9a480e5592bd8b9a7cb578608f2b66e4ea03fc /sql/wsrep_priv.h | |
| parent | ebfa24b1d24377a241b79883da96969a9150f22c (diff) | |
| download | mariadb-git-8e84b9e740ff3641f1fc500a616962cb3bc75a64.tar.gz | |
Merged in change sets 3772-3779 from lp:codership-mysql/5.5mariadb-galera-5.5.25
Diffstat (limited to 'sql/wsrep_priv.h')
| -rw-r--r-- | sql/wsrep_priv.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/wsrep_priv.h b/sql/wsrep_priv.h index 32d0cebfd33..700639ebcb1 100644 --- a/sql/wsrep_priv.h +++ b/sql/wsrep_priv.h @@ -37,14 +37,14 @@ extern int wsrep_sst_donate_cb (void* app_ctx, const char* state, size_t state_len, bool bypass); -extern size_t default_ip (char* buf, size_t buf_len); -extern size_t default_address(char* buf, size_t buf_len); +extern size_t guess_ip (char* buf, size_t buf_len); +extern size_t guess_address(char* buf, size_t buf_len); extern wsrep_uuid_t local_uuid; extern wsrep_seqno_t local_seqno; /*! SST thread signals init thread about sst completion */ -extern void wsrep_sst_complete(wsrep_uuid_t* uuid, wsrep_seqno_t seqno, bool); +extern void wsrep_sst_complete(const wsrep_uuid_t* uuid, wsrep_seqno_t, bool); extern void wsrep_notify_status (wsrep_member_status_t new_status, const wsrep_view_info_t* view = 0); |