summaryrefslogtreecommitdiff
path: root/sql/wsrep_dummy.cc
diff options
context:
space:
mode:
authorTeemu Ollakka <teemu.ollakka@galeracluster.com>2018-03-21 12:02:09 +0200
committerTeemu Ollakka <teemu.ollakka@galeracluster.com>2018-03-21 12:02:09 +0200
commit33aad1d273832bb85a6718748c6f59184108a516 (patch)
treef7e63b060fa2f7a3369a095eacd745ce5a9aaf55 /sql/wsrep_dummy.cc
parentb125ae0a842744dbf40fb38cc3df0e2ba3721dd3 (diff)
downloadmariadb-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_dummy.cc')
-rw-r--r--sql/wsrep_dummy.cc9
1 files changed, 9 insertions, 0 deletions
diff --git a/sql/wsrep_dummy.cc b/sql/wsrep_dummy.cc
index c83f64e9cb4..0b6e7e0d5bb 100644
--- a/sql/wsrep_dummy.cc
+++ b/sql/wsrep_dummy.cc
@@ -29,6 +29,15 @@ enum wsrep_conflict_state wsrep_thd_conflict_state(THD *, my_bool)
int wsrep_is_wsrep_xid(const XID*)
{ return 0; }
+long long wsrep_xid_seqno(const XID* x)
+{ return -1; }
+
+const unsigned char* wsrep_xid_uuid(const XID*)
+{
+ static const unsigned char uuid[16] = {0};
+ return uuid;
+}
+
bool wsrep_prepare_key(const uchar*, size_t, const uchar*, size_t, struct wsrep_buf*, size_t*)
{ return 0; }