diff options
Diffstat (limited to 'src/include/access')
| -rw-r--r-- | src/include/access/xlog.h | 8 | ||||
| -rw-r--r-- | src/include/access/xlog_internal.h | 11 |
2 files changed, 6 insertions, 13 deletions
diff --git a/src/include/access/xlog.h b/src/include/access/xlog.h index 8d3d3cfb62d..eeee24bc41a 100644 --- a/src/include/access/xlog.h +++ b/src/include/access/xlog.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/xlog.h,v 1.57 2004/08/29 05:06:55 momjian Exp $ + * $PostgreSQL: pgsql/src/include/access/xlog.h,v 1.58 2004/08/29 16:34:48 tgl Exp $ */ #ifndef XLOG_H #define XLOG_H @@ -35,18 +35,18 @@ typedef struct XLogRecord { crc64 xl_crc; /* CRC for this record */ XLogRecPtr xl_prev; /* ptr to previous record in log */ - XLogRecPtr xl_xact_prev; /* ptr to previous record of this xact */ TransactionId xl_xid; /* xact id */ - uint16 xl_len; /* total len of rmgr data */ + uint32 xl_len; /* total len of rmgr data */ uint8 xl_info; /* flag bits, see below */ RmgrId xl_rmid; /* resource manager for this record */ + /* Depending on MAXALIGN, there are either 2 or 6 wasted bytes here */ + /* ACTUAL LOG DATA FOLLOWS AT END OF STRUCT */ } XLogRecord; #define SizeOfXLogRecord MAXALIGN(sizeof(XLogRecord)) -#define MAXLOGRECSZ 65535 /* the most that'll fit in xl_len */ #define XLogRecGetData(record) ((char*) (record) + SizeOfXLogRecord) diff --git a/src/include/access/xlog_internal.h b/src/include/access/xlog_internal.h index 8ce7fae15b6..70b3f21d986 100644 --- a/src/include/access/xlog_internal.h +++ b/src/include/access/xlog_internal.h @@ -11,7 +11,7 @@ * Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/xlog_internal.h,v 1.4 2004/08/29 05:06:55 momjian Exp $ + * $PostgreSQL: pgsql/src/include/access/xlog_internal.h,v 1.5 2004/08/29 16:34:48 tgl Exp $ */ #ifndef XLOG_INTERNAL_H #define XLOG_INTERNAL_H @@ -58,7 +58,7 @@ typedef struct XLogContRecord /* * Each page of XLOG file has a header like this: */ -#define XLOG_PAGE_MAGIC 0xD05B /* can be used as WAL version indicator */ +#define XLOG_PAGE_MAGIC 0xD05C /* can be used as WAL version indicator */ typedef struct XLogPageHeaderData { @@ -203,13 +203,6 @@ typedef XLogLongPageHeaderData *XLogLongPageHeader; extern char XLogDir[MAXPGPATH]; -/* - * _INTL_MAXLOGRECSZ: max space needed for a record including header and - * any backup-block data. - */ -#define _INTL_MAXLOGRECSZ (SizeOfXLogRecord + MAXLOGRECSZ + \ - XLR_MAX_BKP_BLOCKS * (sizeof(BkpBlock) + BLCKSZ)) - /* * Method table for resource managers. |