diff options
| author | Teemu Ollakka <teemu.ollakka@galeracluster.com> | 2018-03-21 12:02:09 +0200 |
|---|---|---|
| committer | Teemu Ollakka <teemu.ollakka@galeracluster.com> | 2018-03-21 12:02:09 +0200 |
| commit | 33aad1d273832bb85a6718748c6f59184108a516 (patch) | |
| tree | f7e63b060fa2f7a3369a095eacd745ce5a9aaf55 /extra/mariabackup/wsrep.cc | |
| parent | b125ae0a842744dbf40fb38cc3df0e2ba3721dd3 (diff) | |
| download | mariadb-git-33aad1d273832bb85a6718748c6f59184108a516.tar.gz | |
MDEV-15505 Fixes to compilation without -DWITH_WSREP:BOOL=ON
Removed including wsrep_api.h from service_wsrep.h. This caused
various kinds of collisions with definitions when wsrep is
not supposed to be built in. Defined functions wsrep_xid_seqno()
and wsrep_xid_uuid() in wsrep_dummy.cc. Replaced wsrep_seqno_t
with long long where wsrep_api.h is not included.
Removed wsrep_xid_seqno() macro from wsrep_mysqld.h and made
wsrep code using wsrep_xid_seqno() in handler.cc to be compiled
in only if WITH_WSREP is ON.
Included wsrep_api.h for mariabackup if WITH_WSREP is ON.
Diffstat (limited to 'extra/mariabackup/wsrep.cc')
| -rw-r--r-- | extra/mariabackup/wsrep.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/extra/mariabackup/wsrep.cc b/extra/mariabackup/wsrep.cc index dd3d5cb60d2..fac1fdcf583 100644 --- a/extra/mariabackup/wsrep.cc +++ b/extra/mariabackup/wsrep.cc @@ -49,6 +49,8 @@ permission notice: #include "common.h" #ifdef WITH_WSREP +#include <wsrep_api.h> + /*! Name of file where Galera info is stored on recovery */ #define XB_GALERA_INFO_FILENAME "xtrabackup_galera_info" @@ -62,7 +64,7 @@ xb_write_galera_info(bool incremental_prepare) FILE* fp; XID xid; char uuid_str[40]; - wsrep_seqno_t seqno; + long long seqno; MY_STAT statinfo; /* Do not overwrite existing an existing file to be compatible with |