diff options
| author | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-11-26 16:48:30 +0200 |
|---|---|---|
| committer | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-11-26 16:48:30 +0200 |
| commit | a2594e96f7c7fe762a8165916551ae96bcbb869f (patch) | |
| tree | fa1e4eb2a6d6ef1ca8a039a2afe48a65bca6ab33 /wsrep/wsrep_loader.c | |
| parent | 2b4183f10b54a5b3f8c848d897b3107859c23fa4 (diff) | |
| download | mariadb-git-a2594e96f7c7fe762a8165916551ae96bcbb869f.tar.gz | |
Merges from lp:codership-mysql/5.5 up to rev #3893, this changes to wsrep API #24
Diffstat (limited to 'wsrep/wsrep_loader.c')
| -rw-r--r-- | wsrep/wsrep_loader.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/wsrep/wsrep_loader.c b/wsrep/wsrep_loader.c index b4460658f80..8ae6ea962ec 100644 --- a/wsrep/wsrep_loader.c +++ b/wsrep/wsrep_loader.c @@ -70,15 +70,18 @@ static int verify(const wsrep_t *wh, const char *iface_ver) VERIFY(wh->post_rollback); VERIFY(wh->replay_trx); VERIFY(wh->abort_pre_commit); - VERIFY(wh->append_query); VERIFY(wh->append_key); + VERIFY(wh->append_data); VERIFY(wh->free_connection); VERIFY(wh->to_execute_start); VERIFY(wh->to_execute_end); + VERIFY(wh->preordered_collect); + VERIFY(wh->preordered_commit); VERIFY(wh->sst_sent); VERIFY(wh->sst_received); VERIFY(wh->stats_get); VERIFY(wh->stats_free); + VERIFY(wh->stats_reset); VERIFY(wh->pause); VERIFY(wh->resume); VERIFY(wh->desync); @@ -93,6 +96,7 @@ static int verify(const wsrep_t *wh, const char *iface_ver) return 0; } +typedef int (*wsrep_loader_fun)(wsrep_t*); static wsrep_loader_fun wsrep_dlf(void *dlh, const char *sym) { @@ -175,7 +179,7 @@ out: *hptr = NULL; } else { snprintf (msg, msg_len, - "wsrep_load(): %s %s by %s loaded succesfully.", + "wsrep_load(): %s %s by %s loaded successfully.", (*hptr)->provider_name, (*hptr)->provider_version, (*hptr)->provider_vendor); logger (WSREP_LOG_INFO, msg); |