From 7d9504d4e26aefe6317a2801b1e3d2d06febdbc0 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Mon, 14 May 2001 21:58:10 +0000
Subject: [PATCH] Pg_varaiable removal cleanup found from regression.

---
 src/backend/catalog/Makefile       |  4 +--
 src/include/catalog/pg_attribute.h | 13 +---------
 src/include/catalog/pg_variable.h  | 41 ------------------------------
 3 files changed, 3 insertions(+), 55 deletions(-)
 delete mode 100644 src/include/catalog/pg_variable.h

diff --git a/src/backend/catalog/Makefile b/src/backend/catalog/Makefile
index 4c5f023f35..51a1aecca1 100644
--- a/src/backend/catalog/Makefile
+++ b/src/backend/catalog/Makefile
@@ -2,7 +2,7 @@
 #
 # Makefile for catalog
 #
-# $Header: /cvsroot/pgsql/src/backend/catalog/Makefile,v 1.33 2001/05/14 20:30:19 momjian Exp $
+# $Header: /cvsroot/pgsql/src/backend/catalog/Makefile,v 1.34 2001/05/14 21:58:10 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -23,7 +23,7 @@ SUBSYS.o: $(OBJS)
 
 
 GLOBAL_BKI_SRCS := $(addprefix $(top_srcdir)/src/include/catalog/,\
-	pg_database.h pg_variable.h pg_shadow.h pg_group.h pg_log.h \
+	pg_database.h pg_shadow.h pg_group.h pg_log.h \
     )
 
 TEMPLATE1_BKI_SRCS := $(addprefix $(top_srcdir)/src/include/catalog/,\
diff --git a/src/include/catalog/pg_attribute.h b/src/include/catalog/pg_attribute.h
index 6e11aa6d53..c74dc33f74 100644
--- a/src/include/catalog/pg_attribute.h
+++ b/src/include/catalog/pg_attribute.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_attribute.h,v 1.71 2001/05/07 00:43:24 tgl Exp $
+ * $Id: pg_attribute.h,v 1.72 2001/05/14 21:58:10 momjian Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -527,17 +527,6 @@ DATA(insert OID = 0 ( 1219 xmax				28 0  4  -5 0 -1 -1 t p f i f f));
 DATA(insert OID = 0 ( 1219 cmax				29 0  4  -6 0 -1 -1 t p f i f f));
 DATA(insert OID = 0 ( 1219 tableoid			26 0  4  -7 0 -1 -1 t p f i f f));
 
-/* ----------------
- *		pg_variable - this relation is modified by special purpose access
- *				  method code.	The following is garbage but is needed
- *				  so that the reldesc code works properly.
- * ----------------
- */
-#define Schema_pg_variable \
-{ 1264, {"varfoo"},  26, 0, 4, 1, 0, -1, -1, true, 'p', false, 'i', false, false }
-
-DATA(insert OID = 0 ( 1264 varfoo			26 0  4   1 0 -1 -1 t p f i f f));
-
 /* ----------------
  *		pg_log - this relation is modified by special purpose access
  *				  method code.	The following is garbage but is needed
diff --git a/src/include/catalog/pg_variable.h b/src/include/catalog/pg_variable.h
deleted file mode 100644
index 5010633d2b..0000000000
--- a/src/include/catalog/pg_variable.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*-------------------------------------------------------------------------
- *
- * pg_variable.h
- *	  the system variable relation "pg_variable" is not a "heap" relation.
- *	  it is automatically created by the transam/ code and the
- *	  information here is all bogus and is just here to make the
- *	  relcache code happy.
- *
- *
- * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
- * Portions Copyright (c) 1994, Regents of the University of California
- *
- * $Id: pg_variable.h,v 1.8 2001/01/24 19:43:23 momjian Exp $
- *
- * NOTES
- *	  The structures and macros used by the transam/ code
- *	  to access pg_variable should someday go here -cim 6/18/90
- *
- *-------------------------------------------------------------------------
- */
-#ifndef PG_VARIABLE_H
-#define PG_VARIABLE_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_variable) BOOTSTRAP
-{
-	Oid			varfoo;
-} FormData_pg_variable;
-
-typedef FormData_pg_variable *Form_pg_variable;
-
-#define Natts_pg_variable		1
-#define Anum_pg_variable_varfoo 1
-
-#endif	 /* PG_VARIABLE_H */
-- 
2.40.0