diff options
Diffstat (limited to 'src/include')
-rw-r--r-- | src/include/bootstrap/bootstrap.h | 4 | ||||
-rw-r--r-- | src/include/catalog/catalog.h | 3 | ||||
-rw-r--r-- | src/include/catalog/catname.h | 4 | ||||
-rw-r--r-- | src/include/catalog/catversion.h | 4 | ||||
-rw-r--r-- | src/include/catalog/heap.h | 4 | ||||
-rw-r--r-- | src/include/catalog/pg_database.h | 4 | ||||
-rw-r--r-- | src/include/catalog/pg_group.h | 4 | ||||
-rw-r--r-- | src/include/catalog/pg_shadow.h | 7 | ||||
-rw-r--r-- | src/include/postgres.h | 4 |
9 files changed, 19 insertions, 19 deletions
diff --git a/src/include/bootstrap/bootstrap.h b/src/include/bootstrap/bootstrap.h index a2e3a0df19..49e91004e9 100644 --- a/src/include/bootstrap/bootstrap.h +++ b/src/include/bootstrap/bootstrap.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: bootstrap.h,v 1.28 2002/03/26 19:16:20 tgl Exp $ + * $Id: bootstrap.h,v 1.29 2002/04/27 21:24:34 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -31,7 +31,7 @@ typedef struct hashnode } hashnode; -extern Relation reldesc; +extern Relation boot_reldesc; extern Form_pg_attribute attrtypes[MAXATTR]; extern int numattr; extern int BootstrapMain(int ac, char *av[]); diff --git a/src/include/catalog/catalog.h b/src/include/catalog/catalog.h index 255bb265c4..1a92b5e32e 100644 --- a/src/include/catalog/catalog.h +++ b/src/include/catalog/catalog.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: catalog.h,v 1.23 2002/04/12 20:38:30 tgl Exp $ + * $Id: catalog.h,v 1.24 2002/04/27 21:24:34 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -30,7 +30,6 @@ extern bool IsSystemNamespace(Oid namespaceId); extern bool IsToastNamespace(Oid namespaceId); extern bool IsReservedName(const char *name); -extern bool IsSharedSystemRelationName(const char *relname); extern Oid newoid(void); diff --git a/src/include/catalog/catname.h b/src/include/catalog/catname.h index bf3bf78975..5105294639 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.24 2002/03/22 21:34:44 tgl Exp $ + * $Id: catname.h,v 1.25 2002/04/27 21:24:34 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -42,6 +42,4 @@ #define RelCheckRelationName "pg_relcheck" #define TriggerRelationName "pg_trigger" -extern char *SharedSystemRelationNames[]; - #endif /* CATNAME_H */ diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h index cf71893336..6ebe79cc6a 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.127 2002/04/26 01:24:08 tgl Exp $ + * $Id: catversion.h,v 1.128 2002/04/27 21:24:34 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -53,6 +53,6 @@ */ /* yyyymmddN */ -#define CATALOG_VERSION_NO 200204251 +#define CATALOG_VERSION_NO 200204271 #endif diff --git a/src/include/catalog/heap.h b/src/include/catalog/heap.h index a0ab4c708a..2a81f5b260 100644 --- a/src/include/catalog/heap.h +++ b/src/include/catalog/heap.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: heap.h,v 1.49 2002/03/31 06:26:32 tgl Exp $ + * $Id: heap.h,v 1.50 2002/04/27 21:24:34 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -30,6 +30,7 @@ typedef struct RawColumnDefault extern Relation heap_create(const char *relname, Oid relnamespace, TupleDesc tupDesc, + bool shared_relation, bool storage_create, bool allow_system_table_mods); @@ -39,6 +40,7 @@ extern Oid heap_create_with_catalog(const char *relname, Oid relnamespace, TupleDesc tupdesc, char relkind, + bool shared_relation, bool relhasoids, bool allow_system_table_mods); diff --git a/src/include/catalog/pg_database.h b/src/include/catalog/pg_database.h index 3e7c08dc21..c86f738d87 100644 --- a/src/include/catalog/pg_database.h +++ b/src/include/catalog/pg_database.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_database.h,v 1.23 2002/04/21 00:26:43 tgl Exp $ + * $Id: pg_database.h,v 1.24 2002/04/27 21:24:34 tgl Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -31,7 +31,7 @@ * typedef struct FormData_pg_database * ---------------- */ -CATALOG(pg_database) BOOTSTRAP +CATALOG(pg_database) BOOTSTRAP BKI_SHARED_RELATION { NameData datname; /* database name */ int4 datdba; /* sysid of owner */ diff --git a/src/include/catalog/pg_group.h b/src/include/catalog/pg_group.h index e64cb3f396..d240dfe804 100644 --- a/src/include/catalog/pg_group.h +++ b/src/include/catalog/pg_group.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: pg_group.h,v 1.13 2001/11/05 17:46:32 momjian Exp $ + * $Id: pg_group.h,v 1.14 2002/04/27 21:24:34 tgl Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -25,7 +25,7 @@ * ---------------- */ -CATALOG(pg_group) BOOTSTRAP BKI_WITHOUT_OIDS +CATALOG(pg_group) BOOTSTRAP BKI_SHARED_RELATION BKI_WITHOUT_OIDS { NameData groname; int4 grosysid; diff --git a/src/include/catalog/pg_shadow.h b/src/include/catalog/pg_shadow.h index fd372ae7bf..a46790b353 100644 --- a/src/include/catalog/pg_shadow.h +++ b/src/include/catalog/pg_shadow.h @@ -9,7 +9,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_shadow.h,v 1.19 2002/04/11 05:32:03 petere Exp $ + * $Id: pg_shadow.h,v 1.20 2002/04/27 21:24:34 tgl Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -29,7 +29,7 @@ * typedef struct FormData_pg_shadow * ---------------- */ -CATALOG(pg_shadow) BOOTSTRAP BKI_WITHOUT_OIDS +CATALOG(pg_shadow) BOOTSTRAP BKI_SHARED_RELATION BKI_WITHOUT_OIDS { NameData usename; int4 usesysid; @@ -37,8 +37,9 @@ CATALOG(pg_shadow) BOOTSTRAP BKI_WITHOUT_OIDS bool usetrace; bool usesuper; /* read this field via superuser() only */ bool usecatupd; + /* remaining fields may be null; use heap_getattr to read them! */ text passwd; - int4 valuntil; + int4 valuntil; /* actually abstime */ text useconfig[1]; } FormData_pg_shadow; diff --git a/src/include/postgres.h b/src/include/postgres.h index cc647c2d2d..4fd2fd9bbd 100644 --- a/src/include/postgres.h +++ b/src/include/postgres.h @@ -10,7 +10,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1995, Regents of the University of California * - * $Id: postgres.h,v 1.56 2001/11/05 17:46:31 momjian Exp $ + * $Id: postgres.h,v 1.57 2002/04/27 21:24:34 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -597,7 +597,7 @@ extern int assertTest(int val); #define CATALOG(x) typedef struct CppConcat(FormData_,x) #define BOOTSTRAP - +#define BKI_SHARED_RELATION #define BKI_WITHOUT_OIDS /* these need to expand into some harmless, repeatable declaration */ |