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 /sql/wsrep_xid.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 'sql/wsrep_xid.cc')
| -rw-r--r-- | sql/wsrep_xid.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/wsrep_xid.cc b/sql/wsrep_xid.cc index 04d48819397..618c98eade7 100644 --- a/sql/wsrep_xid.cc +++ b/sql/wsrep_xid.cc @@ -91,7 +91,7 @@ wsrep_seqno_t wsrep_xid_seqno(const XID& xid) return ret; } -wsrep_seqno_t wsrep_xid_seqno(const xid_t* xid) +long long wsrep_xid_seqno(const xid_t* xid) { DBUG_ASSERT(xid); return wsrep_xid_seqno(*xid); |