From 03e5248d0f09f46b2fcaff266e7b2f0f997d6cfd Mon Sep 17 00:00:00 2001
From: Alvaro Herrera <alvherre@alvh.no-ip.org>
Date: Fri, 14 Nov 2008 01:57:42 +0000
Subject: Replace the usage of heap_addheader to create pg_attribute tuples
 with regular heap_form_tuple.  Since this removes the last remaining caller
 of heap_addheader, remove it.

Extracted from the column privileges patch from Stephen Frost, with further
code cleanups by me.
---
 src/include/access/htup.h  | 4 +---
 src/include/catalog/heap.h | 7 ++++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'src/include')

diff --git a/src/include/access/htup.h b/src/include/access/htup.h
index 6bcd9cdcbc2..3e075236d37 100644
--- a/src/include/access/htup.h
+++ b/src/include/access/htup.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/access/htup.h,v 1.103 2008/11/02 01:45:28 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/access/htup.h,v 1.104 2008/11/14 01:57:42 alvherre Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -847,7 +847,5 @@ extern void heap_free_minimal_tuple(MinimalTuple mtup);
 extern MinimalTuple heap_copy_minimal_tuple(MinimalTuple mtup);
 extern HeapTuple heap_tuple_from_minimal_tuple(MinimalTuple mtup);
 extern MinimalTuple minimal_tuple_from_heap_tuple(HeapTuple htup);
-extern HeapTuple heap_addheader(int natts, bool withoid,
-			   Size structlen, void *structure);
 
 #endif   /* HTUP_H */
diff --git a/src/include/catalog/heap.h b/src/include/catalog/heap.h
index 52347a65522..62597dfe828 100644
--- a/src/include/catalog/heap.h
+++ b/src/include/catalog/heap.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/catalog/heap.h,v 1.88 2008/05/09 23:32:04 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/catalog/heap.h,v 1.89 2008/11/14 01:57:42 alvherre Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,6 +15,7 @@
 #define HEAP_H
 
 #include "parser/parse_node.h"
+#include "catalog/indexing.h"
 
 
 typedef struct RawColumnDefault
@@ -65,6 +66,10 @@ extern void heap_truncate_check_FKs(List *relations, bool tempTables);
 
 extern List *heap_truncate_find_FKs(List *relationIds);
 
+extern void InsertPgAttributeTuple(Relation pg_attribute_rel,
+						Form_pg_attribute new_attribute,
+						CatalogIndexState indstate);
+
 extern void InsertPgClassTuple(Relation pg_class_desc,
 				   Relation new_rel_desc,
 				   Oid new_rel_oid,
-- 
cgit v1.2.3