From 4107af8810c49dcf17ade88342179594eb1ca040 Mon Sep 17 00:00:00 2001 From: Seppo Jaakola Date: Thu, 13 Jun 2013 10:22:37 +0300 Subject: [PATCH] References: lp:1182441 - merged fix from revision: http://bazaar.launchpad.net/~percona-core/percona-xtradb-cluster/release-5.5.31/revision/416 --- storage/xtradb/include/trx0sys.h | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/storage/xtradb/include/trx0sys.h b/storage/xtradb/include/trx0sys.h index 4683c097b53..4747fd979aa 100644 --- a/storage/xtradb/include/trx0sys.h +++ b/storage/xtradb/include/trx0sys.h @@ -566,6 +566,22 @@ We must remember this limit in order to keep file compatibility. */ //#if UNIV_PAGE_SIZE < 4096 //# error "UNIV_PAGE_SIZE < 4096" //#endif + + +/* The offset to WSREP XID headers */ +#ifdef WITH_WSREP +#define TRX_SYS_WSREP_XID_INFO (UNIV_PAGE_SIZE - 3500) +#define TRX_SYS_WSREP_XID_MAGIC_N_FLD 0 +#define TRX_SYS_WSREP_XID_MAGIC_N 0x77737265 + +/* XID field: formatID, gtrid_len, bqual_len, xid_data */ +#define TRX_SYS_WSREP_XID_LEN (4 + 4 + 4 + XIDDATASIZE) +#define TRX_SYS_WSREP_XID_FORMAT 4 +#define TRX_SYS_WSREP_XID_GTRID_LEN 8 +#define TRX_SYS_WSREP_XID_BQUAL_LEN 12 +#define TRX_SYS_WSREP_XID_DATA 16 +#endif /* WITH_WSREP*/ + /** The offset of the MySQL replication info in the trx system header; this contains the same fields as TRX_SYS_MYSQL_LOG_INFO below. These are written at prepare time and are the main copy. */ @@ -589,22 +605,6 @@ crash recovery rollbacks a PREPAREd transaction, they are copied back. */ within that file */ #define TRX_SYS_MYSQL_LOG_NAME 12 /*!< MySQL log file name */ -#ifdef WITH_WSREP -/* We hijack TRX_SYS_MYSQL_MASTER_LOG_INFO, it seems to be completely unused - otherwise (see comments for MySQL bug #34058). */ -/** */ -#define TRX_SYS_WSREP_XID_INFO TRX_SYS_MYSQL_MASTER_LOG_INFO -#define TRX_SYS_WSREP_XID_MAGIC_N_FLD 0 -#define TRX_SYS_WSREP_XID_MAGIC_N 0x77737265 - -/* XID field: formatID, gtrid_len, bqual_len, xid_data */ -#define TRX_SYS_WSREP_XID_LEN (4 + 4 + 4 + XIDDATASIZE) -#define TRX_SYS_WSREP_XID_FORMAT 4 -#define TRX_SYS_WSREP_XID_GTRID_LEN 8 -#define TRX_SYS_WSREP_XID_BQUAL_LEN 12 -#define TRX_SYS_WSREP_XID_DATA 16 -#endif /* WITH_WSREP*/ - /** Doublewrite buffer */ /* @{ */ /** The offset of the doublewrite buffer header on the trx system header page */