diff options
author | Seppo Jaakola <seppo.jaakola@codership.com> | 2012-08-09 01:47:21 +0300 |
---|---|---|
committer | Seppo Jaakola <seppo.jaakola@codership.com> | 2012-08-09 01:47:21 +0300 |
commit | ebfa24b1d24377a241b79883da96969a9150f22c (patch) | |
tree | ef1198f9dfb1838cbdbc5056f2b84e399b446bfd /sql/wsrep_priv.h | |
parent | 1fd2e10736d6fd198e62054cb9006a3dc13fd55e (diff) | |
parent | a7123f507598690ef0fce68b5d8dc58e63635024 (diff) | |
download | mariadb-git-ebfa24b1d24377a241b79883da96969a9150f22c.tar.gz |
References lp:1034621 - Merge up to mysql-5.5.25 level
merged codership-mysql/5.5 revisions: bzr diff -r3759..3767
merged codership-mysql/5.5 revisions: bzr diff -r3768..3771
Diffstat (limited to 'sql/wsrep_priv.h')
-rw-r--r-- | sql/wsrep_priv.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sql/wsrep_priv.h b/sql/wsrep_priv.h index 4db8abf68de..32d0cebfd33 100644 --- a/sql/wsrep_priv.h +++ b/sql/wsrep_priv.h @@ -26,6 +26,8 @@ #include <pthread.h> #include <cstdio> +extern void wsrep_ready_set (my_bool x); + extern ssize_t wsrep_sst_prepare (void** msg); extern int wsrep_sst_donate_cb (void* app_ctx, void* recv_ctx, @@ -38,8 +40,8 @@ extern int wsrep_sst_donate_cb (void* app_ctx, extern size_t default_ip (char* buf, size_t buf_len); extern size_t default_address(char* buf, size_t buf_len); -extern wsrep_uuid_t local_uuid; -extern wsrep_seqno_t local_seqno; +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); @@ -212,7 +214,7 @@ class thd public: - thd(); + thd(my_bool wsrep_on); ~thd(); THD* const ptr; }; |