Remove pg_magic, defaults, server, hosts, and demon tables. unused.

src/backend/catalog/Makefile

@@ -4,7 +4,7 @@
 #    Makefile for catalog
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/catalog/Makefile,v 1.4 1997/11/13 03:22:18 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/backend/catalog/Makefile,v 1.5 1997/11/15 20:57:02 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -29,8 +29,7 @@ SUBSYS.o: $(OBJS)
 GENBKI= ./genbki.sh
 
 GLOBALBKI_SRCS= $(addprefix ../../include/catalog/, \
-                  pg_database.h pg_demon.h pg_magic.h pg_defaults.h \
-                  pg_variable.h pg_server.h pg_user.h pg_hosts.h \
+                  pg_database.h pg_variable.h pg_user.h \
                   pg_group.h pg_log.h \
                  )
 

src/backend/parser/gram.y

@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 1.66 1997/11/14 06:09:07 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 1.67 1997/11/15 20:57:09 momjian Exp $
  *
  * HISTORY
  *	  AUTHOR			DATE			MAJOR EVENT
@@ -3366,10 +3366,9 @@ relation_name:	SpecialRuleRelation
 				}
 		| ColId
 				{
-					/* disallow refs to magic system tables */
+					/* disallow refs to variable system tables */
 					if (strcmp(LogRelationName, $1) == 0
-					   || strcmp(VariableRelationName, $1) == 0
-					   || strcmp(MagicRelationName, $1) == 0)
+					   || strcmp(VariableRelationName, $1) == 0)
 						elog(WARN,"%s cannot be accessed by users",$1);
 					else
 						$$ = $1;

src/backend/utils/init/globals.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/init/globals.c,v 1.15 1997/11/02 15:26:12 vadim Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/init/globals.c,v 1.16 1997/11/15 20:57:27 momjian Exp $
  *
  * NOTES
  *	  Globals used all over the place should be declared here and not
@@ -107,13 +107,8 @@ char	   *IndexedCatalogNames[] = {
  */
 char	   *SharedSystemRelationNames[] = {
 	DatabaseRelationName,
-	DefaultsRelationName,
-	DemonRelationName,
 	GroupRelationName,
-	HostsRelationName,
 	LogRelationName,
-	MagicRelationName,
-	ServerRelationName,
 	UserRelationName,
 	VariableRelationName,
 	0

src/bin/initdb/initdb.sh

@@ -26,7 +26,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.27 1997/11/15 17:15:34 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.28 1997/11/15 20:57:30 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -346,15 +346,10 @@ fi
 
 echo
 
-echo "vacuuming template1"
-echo "vacuum analyze" | postgres -F -Q -D$PGDATA template1 2>&1 > /dev/null |\
-	grep -v "^DEBUG:"
-
 echo "loading pg_description"
 echo "copy pg_description from '$TEMPLATE_DESCR'" | postgres -F -Q -D$PGDATA template1 > /dev/null
 echo "copy pg_description from '$GLOBAL_DESCR'" | postgres -F -Q -D$PGDATA template1 > /dev/null
-echo "vacuum analyze pg_description" | postgres -F -Q -D$PGDATA template1 2>&1 > /dev/null |\
-	grep -v "^DEBUG:"
-
-
 
+echo "vacuuming template1"
+echo "vacuum analyze" | postgres -F -Q -D$PGDATA template1 2>&1 > /dev/null |\
+	grep -v "^DEBUG:"

src/include/catalog/catname.h

@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: catname.h,v 1.7 1997/11/02 15:26:50 vadim Exp $
+ * $Id: catname.h,v 1.8 1997/11/15 20:57:38 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,10 +21,8 @@
 #define  AccessMethodProcedureRelationName "pg_amproc"
 #define  AttributeRelationName "pg_attribute"
 #define  DatabaseRelationName "pg_database"
-#define  DefaultsRelationName "pg_defaults"
-#define  DemonRelationName "pg_demon"
+#define  DescriptionRelationName "pg_description"
 #define  GroupRelationName "pg_group"
-#define  HostsRelationName "pg_hosts"
 #define  IndexRelationName "pg_index"
 #define  InheritProcedureRelationName "pg_inheritproc"
 #define  InheritsRelationName "pg_inherits"
@@ -32,13 +30,11 @@
 #define  LanguageRelationName "pg_language"
 #define  ListenerRelationName "pg_listener"
 #define  LogRelationName "pg_log"
-#define  MagicRelationName "pg_magic"
 #define  OperatorClassRelationName "pg_opclass"
 #define  OperatorRelationName "pg_operator"
 #define  ProcedureRelationName "pg_proc"
 #define  RelationRelationName "pg_class"
 #define  RewriteRelationName "pg_rewrite"
-#define  ServerRelationName "pg_server"
 #define  StatisticRelationName "pg_statistic"
 #define  TypeRelationName "pg_type"
 #define  UserRelationName "pg_user"

src/include/catalog/indexing.h

@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: indexing.h,v 1.10 1997/11/15 17:15:35 momjian Exp $
+ * $Id: indexing.h,v 1.11 1997/11/15 20:57:38 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -27,7 +27,7 @@
 #define Num_pg_attrdef_indices	1
 #define Num_pg_relcheck_indices 1
 #define Num_pg_trigger_indices	1
-#define Num_pg_description_indices	1
+#define Num_pg_objoid_indices	1
 
 
 /*

src/include/catalog/pg_attribute.h

@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_attribute.h,v 1.17 1997/11/02 15:26:56 vadim Exp $
+ * $Id: pg_attribute.h,v 1.18 1997/11/15 20:57:40 momjian Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -227,15 +227,12 @@ DATA(insert OID = 0 ( 1262 xmax				28 0  4  -5 0 -1 f f i f f));
 DATA(insert OID = 0 ( 1262 cmax				29 0  4  -6 0 -1 t f i f f));
 
 /* ----------------
- *		pg_demon
+ *		pg_description
  * ----------------
  */
-DATA(insert OID = 0 ( 1251 demserid			26 0  4   1 0 -1 t f i f f));
-DATA(insert OID = 0 ( 1251 demname			19 0 NAMEDATALEN  2 0 -1 f f i f f));
-DATA(insert OID = 0 ( 1251 demowner			26 0  4   3 0 -1 t f i f f));
-DATA(insert OID = 0 ( 1251 demcode			24 0  4   4 0 -1 t f i f f));
+DATA(insert OID = 0 ( 1251 objoid			26 0  4   1 0 -1 t f i f f));
+DATA(insert OID = 0 ( 1251 description		25 0 -1   2 0 -1 f f i f f));
 DATA(insert OID = 0 ( 1251 ctid				27 0  6  -1 0 -1 f f i f f));
-
 DATA(insert OID = 0 ( 1251 oid				26 0  4  -2 0 -1 t f i f f));
 DATA(insert OID = 0 ( 1251 xmin				28 0  4  -3 0 -1 f f i f f));
 DATA(insert OID = 0 ( 1251 cmin				29 0  4  -4 0 -1 t f i f f));
@@ -287,20 +284,6 @@ DATA(insert OID = 0 ( 1255 cmin				29 0  4  -4 0 -1 t f i f f));
 DATA(insert OID = 0 ( 1255 xmax				28 0  4  -5 0 -1 f f i f f));
 DATA(insert OID = 0 ( 1255 cmax				29 0  4  -6 0 -1 t f i f f));
 
-/* ----------------
- *		pg_server
- * ----------------
- */
-DATA(insert OID = 0 ( 1257 sername			19 0 NAMEDATALEN   1 0 -1 f f i f f));
-DATA(insert OID = 0 ( 1257 serpid			21 0  2   2 0 -1 t f s f f));
-DATA(insert OID = 0 ( 1257 serport			21 0  2   3 0 -1 t f s f f));
-DATA(insert OID = 0 ( 1257 ctid				27 0  6  -1 0 -1 f f i f f));
-DATA(insert OID = 0 ( 1257 oid				26 0  4  -2 0 -1 t f i f f));
-DATA(insert OID = 0 ( 1257 xmin				28 0  4  -3 0 -1 f f i f f));
-DATA(insert OID = 0 ( 1257 cmin				29 0  4  -4 0 -1 t f i f f));
-DATA(insert OID = 0 ( 1257 xmax				28 0  4  -5 0 -1 f f i f f));
-DATA(insert OID = 0 ( 1257 cmax				29 0  4  -6 0 -1 t f i f f));
-
 /* ----------------
  *		pg_user
  * ----------------
@@ -420,32 +403,6 @@ DATA(insert OID = 0 ( 1259 cmin				29 0  4  -4 0 -1 t f i f f));
 DATA(insert OID = 0 ( 1259 xmax				28 0  4  -5 0 -1 f f i f f));
 DATA(insert OID = 0 ( 1259 cmax				29 0  4  -6 0 -1 t f i f f));
 
-/* ----------------
- *		pg_magic
- * ----------------
- */
-DATA(insert OID = 0 ( 1253 magname			19 0 NAMEDATALEN   1 0 -1 f f i f f));
-DATA(insert OID = 0 ( 1253 magvalue			19 0 NAMEDATALEN   2 0 -1 f f i f f));
-DATA(insert OID = 0 ( 1253 ctid				27 0  6  -1 0 -1 f f i f f));
-DATA(insert OID = 0 ( 1253 oid				26 0  4  -2 0 -1 t f i f f));
-DATA(insert OID = 0 ( 1253 xmin				28 0  4  -3 0 -1 f f i f f));
-DATA(insert OID = 0 ( 1253 cmin				29 0  4  -4 0 -1 t f i f f));
-DATA(insert OID = 0 ( 1253 xmax				28 0  4  -5 0 -1 f f i f f));
-DATA(insert OID = 0 ( 1253 cmax				29 0  4  -6 0 -1 t f i f f));
-
-/* ----------------
- *		pg_defaults
- * ----------------
- */
-DATA(insert OID = 0 ( 1263 defname			19 0 NAMEDATALEN   1 0 -1 f f i f f));
-DATA(insert OID = 0 ( 1263 defvalue			19 0 NAMEDATALEN   2 0 -1 f f i f f));
-DATA(insert OID = 0 ( 1263 ctid				27 0  6  -1 0 -1 f f i f f));
-DATA(insert OID = 0 ( 1263 oid				26 0  4  -2 0 -1 t f i f f));
-DATA(insert OID = 0 ( 1263 xmin				28 0  4  -3 0 -1 f f i f f));
-DATA(insert OID = 0 ( 1263 cmin				29 0  4  -4 0 -1 t f i f f));
-DATA(insert OID = 0 ( 1263 xmax				28 0  4  -5 0 -1 f f i f f));
-DATA(insert OID = 0 ( 1263 cmax				29 0  4  -6 0 -1 t f i f f));
-
 /* ----------------
  *		pg_attrdef
  * ----------------
@@ -494,16 +451,6 @@ DATA(insert OID = 0 ( 1219 cmin				29 0  4  -4 0 -1 t f i f f));
 DATA(insert OID = 0 ( 1219 xmax				28 0  4  -5 0 -1 f f i f f));
 DATA(insert OID = 0 ( 1219 cmax				29 0  4  -6 0 -1 t f i f f));
 
-/* ----------------
- *		pg_hosts - this relation is used to store host based authentication
- *				   info
- *
- * ----------------
- */
-DATA(insert OID = 0 ( 1273 dbName			19 0  NAMEDATALEN	1 0 -1 f f i f f));
-DATA(insert OID = 0 ( 1273 address			25 0  -1   2 0 -1 f f i f f));
-DATA(insert OID = 0 ( 1273 mask				25 0  -1   3 0 -1 f f i f f));
-
 /* ----------------
  *		pg_variable - this relation is modified by special purpose access
  *				  method code.	The following is garbage but is needed

src/include/catalog/pg_class.h

@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_class.h,v 1.13 1997/11/13 03:22:58 momjian Exp $
+ * $Id: pg_class.h,v 1.14 1997/11/15 20:57:41 momjian Exp $
  *
  * NOTES
  *	  ``pg_relation'' is being replaced by ``pg_class''.  currently
@@ -132,14 +132,10 @@ DATA(insert OID = 1247 (  pg_type 71		  PGUID 0 0 0 0 0 f f r n 16 0 0 0 f _null
 DESCR("");
 DATA(insert OID = 1249 (  pg_attribute 75	  PGUID 0 0 0 0 0 f f r n 16 0 0 0 f _null_ ));
 DESCR("");
-DATA(insert OID = 1251 (  pg_demon 76		  PGUID 0 0 0 0 0 f t r n 4 0 0 0 f _null_ ));
-DESCR("");
-DATA(insert OID = 1253 (  pg_magic 80		  PGUID 0 0 0 0 0 f t r n 2 0 0 0 f _null_ ));
+DATA(insert OID = 1251 (  pg_description 76	  PGUID 0 0 0 0 0 f t r n 2 0 0 0 f _null_ ));
 DESCR("");
 DATA(insert OID = 1255 (  pg_proc 81		  PGUID 0 0 0 0 0 f f r n 16 0 0 0 f _null_ ));
 DESCR("");
-DATA(insert OID = 1257 (  pg_server 82		  PGUID 0 0 0 0 0 f t r n 3 0 0 0 f _null_ ));
-DESCR("");
 DATA(insert OID = 1259 (  pg_class 83		  PGUID 0 0 0 0 0 f f r n 18 0 0 0 f _null_ ));
 DESCR("");
 DATA(insert OID = 1260 (  pg_user 86		  PGUID 0 0 0 0 0 f t r n 6 0 0 0 f _null_ ));
@@ -148,14 +144,10 @@ DATA(insert OID = 1261 (  pg_group 87		  PGUID 0 0 0 0 0 f t s n 3 0 0 0 f _null
 DESCR("");
 DATA(insert OID = 1262 (  pg_database 88	  PGUID 0 0 0 0 0 f t r n 3 0 0 0 f _null_ ));
 DESCR("");
-DATA(insert OID = 1263 (  pg_defaults 89	  PGUID 0 0 0 0 0 f t r n 2 0 0 0 f _null_ ));
-DESCR("");
 DATA(insert OID = 1264 (  pg_variable 90	  PGUID 0 0 0 0 0 f t s n 2 0 0 0 f _null_ ));
 DESCR("");
 DATA(insert OID = 1269 (  pg_log  99		  PGUID 0 0 0 0 0 f t s n 1 0 0 0 f _null_ ));
 DESCR("");
-DATA(insert OID = 1273 (  pg_hosts 101		  PGUID 0 0 0 0 0 f t s n 3 0 0 0 f _null_ ));
-DESCR("");
 DATA(insert OID = 1215 (  pg_attrdef 109	  PGUID 0 0 0 0 0 t t r n 4 0 0 0 f _null_ ));
 DESCR("");
 DATA(insert OID = 1216 (  pg_relcheck 110	  PGUID 0 0 0 0 0 t t r n 4 0 0 0 f _null_ ));
@@ -164,26 +156,19 @@ DATA(insert OID = 1219 (  pg_trigger 111	  PGUID 0 0 0 0 0 t t r n 7 0 0 0 f _nu
 DESCR("");
 
 #define RelOid_pg_type			1247
-#define RelOid_pg_demon			1251
+#define RelOid_pg_description	1251
 #define RelOid_pg_attribute		1249
-#define RelOid_pg_magic			1253
 #define RelOid_pg_proc			1255
-#define RelOid_pg_server		1257
 #define RelOid_pg_class			1259
 #define RelOid_pg_user			1260
 #define RelOid_pg_group			1261
 #define RelOid_pg_database		1262
-#define RelOid_pg_defaults		1263
 #define RelOid_pg_variable		1264
 #define RelOid_pg_log			1269
-#define RelOid_pg_hosts			1273
 #define RelOid_pg_attrdef		1215
 #define RelOid_pg_relcheck		1216
 #define RelOid_pg_trigger		1219
 
-#define MAX_SYSTEM_RELOID		1273	/* this does not seem to be used */
- /* anywhere					  */
-
 #define		  RELKIND_INDEX			  'i'		/* secondary index */
 #define		  RELKIND_RELATION		  'r'		/* cataloged heap */
 #define		  RELKIND_SPECIAL		  's'		/* special (non-heap) */

src/include/catalog/pg_defaults.h

-/*-------------------------------------------------------------------------
- *
- * pg_defaults.h--
- *	 definition of the system "defaults" relation (pg_defaults)
- *	 along with the relation's initial contents.
- *
- *
- * Copyright (c) 1994, Regents of the University of California
- *
- * $Id: pg_defaults.h,v 1.4 1997/09/08 02:35:05 momjian Exp $
- *
- * NOTES
- *	  the genbki.sh script reads this file and generates .bki
- *	  information from the DATA() statements.
- *
- *-------------------------------------------------------------------------
- */
-#ifndef PG_DEFAULTS_H
-#define PG_DEFAULTS_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_defaults definition.  cpp turns this into
- *		typedef struct FormData_pg_defaults
- * ----------------
- */
-CATALOG(pg_defaults) BOOTSTRAP
-{
-	NameData	defname;
-	NameData	defvalue;
-} FormData_pg_defaults;
-
-/* ----------------
- *		Form_pg_defaults corresponds to a pointer to a tuple with
- *		the format of pg_defaults relation.
- * ----------------
- */
-typedef FormData_pg_defaults *Form_pg_defaults;
-
-/* ----------------
- *		compiler constants for pg_defaults
- * ----------------
- */
-#define Natts_pg_defaults				2
-#define Anum_pg_defaults_defname		1
-#define Anum_pg_defaults_defvalue		2
-
-
-#endif							/* PG_DEFAULTS_H */

src/include/catalog/pg_demon.h

-/*-------------------------------------------------------------------------
- *
- * pg_demon.h--
- *	 definition of the system "demon" relation (pg_demon)
- *	 along with the relation's initial contents.
- *
- *
- * Copyright (c) 1994, Regents of the University of California
- *
- * $Id: pg_demon.h,v 1.4 1997/09/08 02:35:06 momjian Exp $
- *
- * NOTES
- *	  the genbki.sh script reads this file and generates .bki
- *	  information from the DATA() statements.
- *
- *-------------------------------------------------------------------------
- */
-#ifndef PG_DEMON_H
-#define PG_DEMON_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_demon definition.  cpp turns this into
- *		typedef struct FormData_pg_demon
- * ----------------
- */
-CATALOG(pg_demon) BOOTSTRAP
-{
-	Oid			demserid;
-	NameData	demname;
-	Oid			demowner;
-	regproc		demcode;
-} FormData_pg_demon;
-
-/* ----------------
- *		Form_pg_demon corresponds to a pointer to a tuple with
- *		the format of pg_demon relation.
- * ----------------
- */
-typedef FormData_pg_demon *Form_pg_demon;
-
-/* ----------------
- *		compiler constants for pg_demon
- * ----------------
- */
-#define Natts_pg_demon					4
-#define Anum_pg_demon_demserid			1
-#define Anum_pg_demon_demname			2
-#define Anum_pg_demon_demowner			3
-#define Anum_pg_demon_demcode			4
-
-#endif							/* PG_DEMON_H */

src/include/catalog/pg_description.h

@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_description.h,v 1.2 1997/11/14 05:57:46 momjian Exp $
+ * $Id: pg_description.h,v 1.3 1997/11/15 20:57:48 momjian Exp $
  *
  * NOTES
  *		the genbki.sh script reads this file and generates .bki
@@ -32,7 +32,7 @@
  *		typedef struct FormData_pg_description
  * ----------------
  */
-CATALOG(pg_description)
+CATALOG(pg_description) BOOTSTRAP
 {
 	Oid			objoid;
 	text		description;
@@ -59,7 +59,8 @@ typedef FormData_pg_description *Form_pg_description;
  */
 
 /* Because the contents of this table are taken from the other *.h files,
-   there is no initialization.
+   there is no initialization.  It is loaded from initdb using a COPY
+   statement.
 */
 
 #endif							/* PG_DESCRIPTION_H */

src/include/catalog/pg_hosts.h

-/*-------------------------------------------------------------------------
- *
- * pg_hosts.h--
- *
- *	   the pg_hosts system catalog provides host-based access to the
- * backend.  Only those hosts that are in the pg_hosts
- *
- *	currently, this table is not used, instead file-based host authentication
- * is used
- *
- * Copyright (c) 1994, Regents of the University of California
- *
- * $Id: pg_hosts.h,v 1.4 1997/09/08 02:35:09 momjian Exp $
- *
- * NOTES
- *	  the genbki.sh script reads this file and generates .bki
- *	  information from the DATA() statements.
- *-------------------------------------------------------------------------
- */
-
-#ifndef PG_HOSTS_H
-#define PG_HOSTS_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.
- * ----------------
- */
-
-CATALOG(pg_hosts) BOOTSTRAP
-{
-	NameData	dbName;
-	text		address;
-	text		mask;
-} FormData_pg_hosts;
-
-typedef FormData_pg_hosts *Form_pg_hosts;
-
-#define Natts_pg_hosts			3
-#define Anum_pg_hosts_dbName	1
-#define Anum_pg_hosts_address	2
-#define Anum_pg_hosts_mask		3
-
-#endif							/* PG_HOSTS_H */

src/include/catalog/pg_magic.h

-/*-------------------------------------------------------------------------
- *
- * pg_magic.h--
- *	  definition of the system "magic" relation (pg_magic)
- *	  along with the relation's initial contents.
- *
- *
- * Copyright (c) 1994, Regents of the University of California
- *
- * $Id: pg_magic.h,v 1.4 1997/09/08 02:35:18 momjian Exp $
- *
- * NOTES
- *	  the genbki.sh script reads this file and generates .bki
- *	  information from the DATA() statements.
- *
- *-------------------------------------------------------------------------
- */
-#ifndef PG_MAGIC_H
-#define PG_MAGIC_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_magic definition.  cpp turns this into
- *		typedef struct FormData_pg_magic
- * ----------------
- */
-CATALOG(pg_magic) BOOTSTRAP
-{
-	NameData	magname;
-	NameData	magvalue;
-} FormData_pg_magic;
-
-/* ----------------
- *		Form_pg_magic corresponds to a pointer to a tuple with
- *		the format of pg_magic relation.
- * ----------------
- */
-typedef FormData_pg_magic *Form_pg_magic;
-
-/* ----------------
- *		compiler constants for pg_magic
- * ----------------
- */
-#define Natts_pg_magic					2
-#define Anum_pg_magic_magname			1
-#define Anum_pg_magic_magvalue			2
-
-#endif							/* PG_MAGIC_H */

src/include/catalog/pg_server.h

-/*-------------------------------------------------------------------------
- *
- * pg_server.h--
- *	  definition of the system "server" relation (pg_server)
- *	  along with the relation's initial contents.
- *
- *
- * Copyright (c) 1994, Regents of the University of California
- *
- * $Id: pg_server.h,v 1.4 1997/09/08 02:35:26 momjian Exp $
- *
- * NOTES
- *	  the genbki.sh script reads this file and generates .bki
- *	  information from the DATA() statements.
- *
- *-------------------------------------------------------------------------
- */
-#ifndef PG_SERVER_H
-#define PG_SERVER_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_server definition.  cpp turns this into
- *		typedef struct FormData_pg_server
- * ----------------
- */
-CATALOG(pg_server) BOOTSTRAP
-{
-	NameData	sername;
-	int2		serpid;
-	int2		serport;
-} FormData_pg_server;
-
-/* ----------------
- *		Form_pg_server corresponds to a pointer to a tuple with
- *		the format of pg_server relation.
- * ----------------
- */
-typedef FormData_pg_server *Form_pg_server;
-
-/* ----------------
- *		compiler constants for pg_server
- * ----------------
- */
-#define Natts_pg_server					3
-#define Anum_pg_server_sername			1
-#define Anum_pg_server_serpid			2
-#define Anum_pg_server_serport			3
-
-#endif							/* PG_SERVER_H */

src/include/catalog/pg_type.h

@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_type.h,v 1.21 1997/11/13 03:23:09 momjian Exp $
+ * $Id: pg_type.h,v 1.22 1997/11/15 20:58:05 momjian Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -210,14 +210,10 @@ DATA(insert OID = 71 (	pg_type		 PGUID 1 1 t b t \054 1247 0 foo bar foo bar c _
 DESCR("");
 DATA(insert OID = 75 (	pg_attribute PGUID 1 1 t b t \054 1249 0 foo bar foo bar c _null_));
 DESCR("");
-DATA(insert OID = 76 (	pg_demon	 PGUID 1 1 t b t \054 1251 0 foo bar foo bar c _null_));
-DESCR("");
-DATA(insert OID = 80 (	pg_magic	 PGUID 1 1 t b t \054 1253 0 foo bar foo bar c _null_));
+DATA(insert OID = 76 (	pg_description	 PGUID 1 1 t b t \054 1251 0 foo bar foo bar c _null_));
 DESCR("");
 DATA(insert OID = 81 (	pg_proc		 PGUID 1 1 t b t \054 1255 0 foo bar foo bar c _null_));
 DESCR("");
-DATA(insert OID = 82 (	pg_server	 PGUID 1 1 t b t \054 1257 0 foo bar foo bar c _null_));
-DESCR("");
 DATA(insert OID = 83 (	pg_class	 PGUID 1 1 t b t \054 1259 0 foo bar foo bar c _null_));
 DESCR("");
 DATA(insert OID = 86 (	pg_user		 PGUID 1 1 t b t \054 1260 0 foo bar foo bar c _null_));
@@ -226,8 +222,6 @@ DATA(insert OID = 87 (	pg_group	 PGUID 1 1 t b t \054 1261 0 foo bar foo bar c _
 DESCR("");
 DATA(insert OID = 88 (	pg_database  PGUID 1 1 t b t \054 1262 0 foo bar foo bar c _null_));
 DESCR("");
-DATA(insert OID = 89 (	pg_defaults  PGUID 1 1 t b t \054 1263 0 foo bar foo bar c _null_));
-DESCR("");
 DATA(insert OID = 90 (	pg_variable  PGUID 1 1 t b t \054 1264 0 foo bar foo bar c _null_));
 DESCR("");
 DATA(insert OID = 99 (	pg_log		 PGUID 1 1 t b t \054 1269 0 foo bar foo bar c _null_));
@@ -235,8 +229,6 @@ DESCR("");
 
 /* OIDS 100 - 199 */
 
-DATA(insert OID = 101 (  pg_hosts	 PGUID 1 1 t b t \054 1273 0 foo bar foo bar c _null_));
-DESCR("");
 DATA(insert OID = 109 (  pg_attrdef  PGUID 1 1 t b t \054 1215 0 foo bar foo bar c _null_));
 DESCR("");
 DATA(insert OID = 110 (  pg_relcheck PGUID 1 1 t b t \054 1216 0 foo bar foo bar c _null_));