summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <jan@hundin.mysql.fi>2005-02-22 15:40:13 +0200
committerunknown <jan@hundin.mysql.fi>2005-02-22 15:40:13 +0200
commit59554966bb8b652f2c8f388937952bbdae407e93 (patch)
tree5c2cde9f5bb08dfd079d74a0e21638bc0c99143b
parentacaa20e21e5c086b2a1b375f4145bec52435482d (diff)
downloadmariadb-git-59554966bb8b652f2c8f388937952bbdae407e93.tar.gz
Fixed a bug on InnoDB X/Open XA prepare.
-rw-r--r--innobase/trx/trx0undo.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/innobase/trx/trx0undo.c b/innobase/trx/trx0undo.c
index 4bfa9c20a54..e9296d1d9c7 100644
--- a/innobase/trx/trx0undo.c
+++ b/innobase/trx/trx0undo.c
@@ -537,7 +537,7 @@ trx_undo_header_create(
/* If X/Open XID exits in the log header we store a
flag of it in upper byte of dict operation flag. */
- if (xid != NULL || xid->formatID != -1) {
+ if (xid != NULL && xid->formatID != -1) {
mach_write_to_1(log_hdr + TRX_UNDO_XID_EXISTS, TRUE);
} else {
mach_write_to_1(log_hdr + TRX_UNDO_XID_EXISTS, FALSE);