diff options
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/access/transam.h | 36 | ||||
| -rw-r--r-- | src/include/catalog/catname.h | 5 | ||||
| -rw-r--r-- | src/include/catalog/catversion.h | 4 | ||||
| -rw-r--r-- | src/include/catalog/pg_class.h | 5 | ||||
| -rw-r--r-- | src/include/catalog/pg_inheritproc.h | 60 | ||||
| -rw-r--r-- | src/include/catalog/pg_ipl.h | 58 | ||||
| -rw-r--r-- | src/include/catalog/pg_type.h | 3 |
7 files changed, 6 insertions, 165 deletions
diff --git a/src/include/access/transam.h b/src/include/access/transam.h index 0da7fe56500..b18f26b951e 100644 --- a/src/include/access/transam.h +++ b/src/include/access/transam.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: transam.h,v 1.32 2001/03/22 04:00:31 momjian Exp $ + * $Id: transam.h,v 1.33 2001/05/14 20:30:21 momjian Exp $ * * NOTES * Transaction System Version 101 now support proper oid @@ -91,38 +91,6 @@ typedef struct LogRelationContentsData typedef LogRelationContentsData *LogRelationContents; -/* ---------------- - * VariableRelationContents structure - * - * The variable relation is a special "relation" which - * is used to store various system "variables" persistantly. - * Unlike other relations in the system, this relation - * is updated in place whenever the variables change. - * - * The first 4 bytes of this relation store the version - * number of the transaction system. - * - * Currently, the relation has only one page and the next - * available xid, the last committed xid and the next - * available oid are stored there. - * - * XXX As of 7.1, pg_variable isn't used anymore; this is dead code. - * ---------------- - */ -#ifdef NOT_USED -typedef struct VariableRelationContentsData -{ - XLogRecPtr LSN; - int TransSystemVersion; - TransactionId nextXidData; - TransactionId lastXidData; /* unused */ - Oid nextOid; -} VariableRelationContentsData; - -typedef VariableRelationContentsData *VariableRelationContents; - -#endif /* NOT_USED */ - /* * VariableCache is placed in shmem and used by * backends to get next available XID & OID. @@ -161,7 +129,6 @@ extern void TransBlockNumberSetXidStatus(Relation relation, bool *failP); /* in transam/varsup.c */ -extern void VariableRelationPutNextXid(TransactionId xid); extern void GetNewTransactionId(TransactionId *xid); extern void ReadNewTransactionId(TransactionId *xid); extern void GetNewObjectId(Oid *oid_return); @@ -174,7 +141,6 @@ extern void CheckMaxObjectId(Oid assigned_oid); /* in transam.c */ extern Relation LogRelation; -extern Relation VariableRelation; extern TransactionId cachedTestXid; extern XidStatus cachedTestXidStatus; diff --git a/src/include/catalog/catname.h b/src/include/catalog/catname.h index 29f58a76971..2f2f2c90f44 100644 --- a/src/include/catalog/catname.h +++ b/src/include/catalog/catname.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: catname.h,v 1.18 2001/01/24 19:43:20 momjian Exp $ + * $Id: catname.h,v 1.19 2001/05/14 20:30:21 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -25,9 +25,7 @@ #define DescriptionRelationName "pg_description" #define GroupRelationName "pg_group" #define IndexRelationName "pg_index" -#define InheritProcedureRelationName "pg_inheritproc" #define InheritsRelationName "pg_inherits" -#define InheritancePrecidenceListRelationName "pg_ipl" #define LanguageRelationName "pg_language" #define LargeObjectRelationName "pg_largeobject" #define ListenerRelationName "pg_listener" @@ -40,7 +38,6 @@ #define ShadowRelationName "pg_shadow" #define StatisticRelationName "pg_statistic" #define TypeRelationName "pg_type" -#define VariableRelationName "pg_variable" #define VersionRelationName "pg_version" #define AttrDefaultRelationName "pg_attrdef" #define RelCheckRelationName "pg_relcheck" diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h index e0ecbb13d92..ab066997fd6 100644 --- a/src/include/catalog/catversion.h +++ b/src/include/catalog/catversion.h @@ -37,7 +37,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: catversion.h,v 1.72 2001/05/10 22:39:24 momjian Exp $ + * $Id: catversion.h,v 1.73 2001/05/14 20:30:21 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -53,6 +53,6 @@ */ /* yyyymmddN */ -#define CATALOG_VERSION_NO 200105101 +#define CATALOG_VERSION_NO 2001051401 #endif diff --git a/src/include/catalog/pg_class.h b/src/include/catalog/pg_class.h index 86de88cc9b6..47cdfc5a23d 100644 --- a/src/include/catalog/pg_class.h +++ b/src/include/catalog/pg_class.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_class.h,v 1.48 2001/05/07 00:43:25 tgl Exp $ + * $Id: pg_class.h,v 1.49 2001/05/14 20:30:21 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -146,8 +146,6 @@ DATA(insert OID = 1261 ( pg_group 87 PGUID 0 1261 0 0 0 0 f t r 3 0 0 0 0 0 DESCR(""); DATA(insert OID = 1262 ( pg_database 88 PGUID 0 1262 0 0 0 0 f t r 7 0 0 0 0 0 f f f _null_ )); DESCR(""); -DATA(insert OID = 1264 ( pg_variable 90 PGUID 0 1264 0 0 0 0 f t s 1 0 0 0 0 0 f f f _null_ )); -DESCR(""); DATA(insert OID = 1269 ( pg_log 99 PGUID 0 1269 0 0 0 0 f t s 1 0 0 0 0 0 f f f _null_ )); DESCR(""); DATA(insert OID = 376 ( pg_xactlock 0 PGUID 0 0 0 0 0 0 f t s 1 0 0 0 0 0 f f f _null_ )); @@ -166,7 +164,6 @@ DESCR(""); #define RelOid_pg_shadow 1260 #define RelOid_pg_group 1261 #define RelOid_pg_database 1262 -#define RelOid_pg_variable 1264 #define RelOid_pg_log 1269 #define RelOid_pg_attrdef 1215 #define RelOid_pg_relcheck 1216 diff --git a/src/include/catalog/pg_inheritproc.h b/src/include/catalog/pg_inheritproc.h deleted file mode 100644 index 6d250d53a8d..00000000000 --- a/src/include/catalog/pg_inheritproc.h +++ /dev/null @@ -1,60 +0,0 @@ -/*------------------------------------------------------------------------- - * - * pg_inheritproc.h - * definition of the system "inheritproc" relation (pg_inheritproc) - * along with the relation's initial contents. - * - * - * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group - * Portions Copyright (c) 1994, Regents of the University of California - * - * $Id: pg_inheritproc.h,v 1.10 2001/01/24 19:43:21 momjian Exp $ - * - * NOTES - * the genbki.sh script reads this file and generates .bki - * information from the DATA() statements. - * - *------------------------------------------------------------------------- - */ -#ifndef PG_INHERITPROC_H -#define PG_INHERITPROC_H - -/* ---------------- - * postgres.h contains the system type definintions and the - * CATALOG(), BOOTSTRAP and DATA() sugar words so this file - * can be read by both genbki.sh and the C compiler. - * ---------------- - */ - -/* ---------------- - * pg_inheritproc definition. cpp turns this into - * typedef struct FormData_pg_inheritproc - * ---------------- - */ -CATALOG(pg_inheritproc) -{ - NameData inhproname; - Oid inhargrelid; - Oid inhdefrelid; - Oid inhproc; -} FormData_pg_inheritproc; - -/* ---------------- - * Form_pg_inheritproc corresponds to a pointer to a tuple with - * the format of pg_inheritproc relation. - * ---------------- - */ -typedef FormData_pg_inheritproc *Form_pg_inheritproc; - -/* ---------------- - * compiler constants for pg_inheritproc - * ---------------- - */ -#define Natts_pg_inheritproc 4 -#define Anum_pg_inheritproc_inhproname 1 -#define Anum_pg_inheritproc_inhargrelid 2 -#define Anum_pg_inheritproc_inhdefrelid 3 -#define Anum_pg_inheritproc_inhproc 4 - - -#endif /* PG_INHERITPROC_H */ diff --git a/src/include/catalog/pg_ipl.h b/src/include/catalog/pg_ipl.h deleted file mode 100644 index eb4b78c8a51..00000000000 --- a/src/include/catalog/pg_ipl.h +++ /dev/null @@ -1,58 +0,0 @@ -/*------------------------------------------------------------------------- - * - * pg_ipl.h - * definition of the system "ipl" relation (pg_ipl) - * along with the relation's initial contents. - * - * - * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group - * Portions Copyright (c) 1994, Regents of the University of California - * - * $Id: pg_ipl.h,v 1.9 2001/01/24 19:43:21 momjian Exp $ - * - * NOTES - * the genbki.sh script reads this file and generates .bki - * information from the DATA() statements. - * - *------------------------------------------------------------------------- - */ -#ifndef PG_IPL_H -#define PG_IPL_H - -/* ---------------- - * postgres.h contains the system type definintions and the - * CATALOG(), BOOTSTRAP and DATA() sugar words so this file - * can be read by both genbki.sh and the C compiler. - * ---------------- - */ - -/* ---------------- - * pg_ipl definition. cpp turns this into - * typedef struct FormData_pg_ipl - * ---------------- - */ -CATALOG(pg_ipl) -{ - Oid iplrelid; - Oid iplipl; - int4 iplseqno; -} FormData_pg_ipl; - -/* ---------------- - * Form_pg_ipl corresponds to a pointer to a tuple with - * the format of pg_ipl relation. - * ---------------- - */ -typedef FormData_pg_ipl *Form_pg_ipl; - -/* ---------------- - * compiler constants for pg_ipl - * ---------------- - */ -#define Natts_pg_ipl 3 -#define Anum_pg_ipl_iplrelid 1 -#define Anum_pg_ipl_iplipl 2 -#define Anum_pg_ipl_iplseqno 3 - - -#endif /* PG_IPL_H */ diff --git a/src/include/catalog/pg_type.h b/src/include/catalog/pg_type.h index bca0bd1446e..1cb9d2a5702 100644 --- a/src/include/catalog/pg_type.h +++ b/src/include/catalog/pg_type.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_type.h,v 1.104 2001/05/03 16:18:02 tgl Exp $ + * $Id: pg_type.h,v 1.105 2001/05/14 20:30:21 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -239,7 +239,6 @@ DATA(insert OID = 83 ( pg_class PGUID 4 4 t c t \054 1259 0 int4in int4out int4 DATA(insert OID = 86 ( pg_shadow PGUID 4 4 t c t \054 1260 0 int4in int4out int4in int4out i p _null_)); DATA(insert OID = 87 ( pg_group PGUID 4 4 t c t \054 1261 0 int4in int4out int4in int4out i p _null_)); DATA(insert OID = 88 ( pg_database PGUID 4 4 t c t \054 1262 0 int4in int4out int4in int4out i p _null_)); -DATA(insert OID = 90 ( pg_variable PGUID 4 4 t c t \054 1264 0 int4in int4out int4in int4out i p _null_)); DATA(insert OID = 99 ( pg_log PGUID 4 4 t c t \054 1269 0 int4in int4out int4in int4out i p _null_)); /* OIDS 100 - 199 */ |