summaryrefslogtreecommitdiff
path: root/sql/wsrep_xid.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2018-08-03 13:02:56 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2018-08-03 13:02:56 +0300
commit814ae57daf3ba7ac7f8c7892fbd54a6142a70f44 (patch)
tree24a647cfd585c6ba42a185002fe9394ab74d4bd4 /sql/wsrep_xid.cc
parent976f92051417a99369f5bb45d9f18c87655a9f85 (diff)
parent9d42eb5e28303adb4d9467ac3e9c3be35d46e643 (diff)
downloadmariadb-git-814ae57daf3ba7ac7f8c7892fbd54a6142a70f44.tar.gz
Merge 10.1 into 10.2
Diffstat (limited to 'sql/wsrep_xid.cc')
-rw-r--r--sql/wsrep_xid.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/wsrep_xid.cc b/sql/wsrep_xid.cc
index 2ff6ea0b32e..c0b7669d8ca 100644
--- a/sql/wsrep_xid.cc
+++ b/sql/wsrep_xid.cc
@@ -131,15 +131,14 @@ bool wsrep_get_SE_checkpoint(wsrep_uuid_t& uuid, wsrep_seqno_t& seqno)
seqno= WSREP_SEQNO_UNDEFINED;
XID xid;
- memset(&xid, 0, sizeof(xid));
- xid.formatID= -1;
+ xid.null();
if (wsrep_get_SE_checkpoint(xid))
{
return true;
}
- if (xid.formatID == -1) // nil XID
+ if (xid.is_null())
{
return false;
}