diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-05-07 13:49:14 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-05-07 13:49:14 +0300 |
| commit | 648cf7176cc95f697abd8b94e860c74768680298 (patch) | |
| tree | 8f3d19e0f1bd607cb515111f106715f9a4e6fcec /sql/wsrep_priv.h | |
| parent | 7b115181987fb88b97ef6d3d88bb16bdbc281e40 (diff) | |
| parent | 1ecd68d867ced1d00ebffdcedbf6bc97493f5067 (diff) | |
| download | mariadb-git-648cf7176cc95f697abd8b94e860c74768680298.tar.gz | |
Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera
Diffstat (limited to 'sql/wsrep_priv.h')
| -rw-r--r-- | sql/wsrep_priv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/wsrep_priv.h b/sql/wsrep_priv.h index 30dce78c1a4..58d8cc4f86d 100644 --- a/sql/wsrep_priv.h +++ b/sql/wsrep_priv.h @@ -26,7 +26,7 @@ #include <pthread.h> #include <cstdio> -void wsrep_ready_set (my_bool x); +my_bool wsrep_ready_set (my_bool x); ssize_t wsrep_sst_prepare (void** msg); wsrep_cb_status wsrep_sst_donate_cb (void* app_ctx, |