database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-10-23 18:49:29 +03:00
Code Activity

bzr merge -c 3921 lp:codership-mysql/5.6

Browse Source
This commit is contained in:
Seppo Jaakola
2013-11-27 00:44:10 +02:00
parent b098b7a84c
commit 9b16346e84
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
storage/innobase/include/trx0sys.h
View File

@@ -549,10 +549,8 @@ this contains the same fields as TRX_SYS_MYSQL_LOG_INFO below */
#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
/* The offset to WSREP XID headers */
#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