4 files changed, 42 insertions, 25 deletions

diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c
index e43fd13d524..8979d099221 100644
--- a/src/backend/nodes/copyfuncs.c
+++ b/src/backend/nodes/copyfuncs.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.42 1998/06/15 19:28:30 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.43 1998/07/15 14:54:31 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -162,11 +162,11 @@ _copyAppend(Append *from)
 	 *	copy remainder of node
 	 * ----------------
 	 */
-	Node_Copy(from, newnode, unionplans);
-	Node_Copy(from, newnode, unionrts);
-	newnode->unionrelid = from->unionrelid;
-	Node_Copy(from, newnode, unionrtentries);
-	Node_Copy(from, newnode, unionstate);
+	Node_Copy(from, newnode, appendplans);
+	Node_Copy(from, newnode, unionrtables);
+	newnode->inheritrelid = from->inheritrelid;
+	Node_Copy(from, newnode, inheritrtable);
+	Node_Copy(from, newnode, appendstate);
 
 	return newnode;
 }
diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c
index d99fefd03d0..43f0204015e 100644
--- a/src/backend/nodes/outfuncs.c
+++ b/src/backend/nodes/outfuncs.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/outfuncs.c,v 1.39 1998/07/14 01:45:24 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/outfuncs.c,v 1.40 1998/07/15 14:54:32 momjian Exp $
  *
  * NOTES
  *	  Every (plan) node in POSTGRES has an associated "out" routine which
@@ -354,17 +354,17 @@ _outAppend(StringInfo str, Append *node)
 	appendStringInfo(str, " APPEND ");
 	_outPlanInfo(str, (Plan *) node);
 
-	appendStringInfo(str, " :unionplans ");
-	_outNode(str, node->unionplans);
+	appendStringInfo(str, " :appendplans ");
+	_outNode(str, node->appendplans);
 
-	appendStringInfo(str, " :unionrts ");
-	_outNode(str, node->unionrts);
+	appendStringInfo(str, " :unionrtables ");
+	_outNode(str, node->unionrtables);
 
-	sprintf(buf, " :unionrelid %d ", node->unionrelid);
+	sprintf(buf, " :inheritrelid %d ", node->inheritrelid);
 	appendStringInfo(str, buf);
 
-	appendStringInfo(str, " :unionrtentries ");
-	_outNode(str, node->unionrtentries);
+	appendStringInfo(str, " :inheritrtable ");
+	_outNode(str, node->inheritrtable);
 
 }
 
diff --git a/src/backend/nodes/print.c b/src/backend/nodes/print.c
index 54e64433b19..d544efb8d90 100644
--- a/src/backend/nodes/print.c
+++ b/src/backend/nodes/print.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/print.c,v 1.15 1998/06/15 19:28:32 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/print.c,v 1.16 1998/07/15 14:54:33 momjian Exp $
  *
  * HISTORY
  *	  AUTHOR			DATE			MAJOR EVENT
@@ -387,6 +387,23 @@ print_plan_recursive(Plan *p, Query *parsetree, int indentLevel, char *label)
 		printf("\n");
 	print_plan_recursive(p->lefttree, parsetree, indentLevel + 3, "l: ");
 	print_plan_recursive(p->righttree, parsetree, indentLevel + 3, "r: ");
+
+	if (nodeTag(p) == T_Append)
+	{
+		List	   *lst;
+		int			whichplan = 0;
+		Append	   *appendplan = (Append *)p;
+		
+		foreach(lst, appendplan->appendplans)
+		{
+			Plan *subnode = (Plan *)lfirst(lst);
+
+			/* I don't think we need to fiddle with the range table here, bjm */
+			print_plan_recursive(subnode, parsetree, indentLevel + 3, "a: ");
+
+			whichplan++;
+		}
+	}
 }
 
 /* print_plan
diff --git a/src/backend/nodes/readfuncs.c b/src/backend/nodes/readfuncs.c
index fc697d394e2..c82e5e5ff86 100644
--- a/src/backend/nodes/readfuncs.c
+++ b/src/backend/nodes/readfuncs.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.31 1998/07/14 01:45:24 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.32 1998/07/15 14:54:34 momjian Exp $
  *
  * NOTES
  *	  Most of the read functions for plan nodes are tested. (In fact, they
@@ -322,18 +322,18 @@ _readAppend()
 
 	_getPlan((Plan *) local_node);
 
-	token = lsptok(NULL, &length);		/* eat :unionplans */
-	local_node->unionplans = nodeRead(true);	/* now read it */
+	token = lsptok(NULL, &length);		/* eat :appendplans */
+	local_node->appendplans = nodeRead(true);	/* now read it */
 
-	token = lsptok(NULL, &length);		/* eat :unionrts */
-	local_node->unionrts = nodeRead(true);		/* now read it */
+	token = lsptok(NULL, &length);		/* eat :unionrtables */
+	local_node->unionrtables = nodeRead(true);		/* now read it */
 
-	token = lsptok(NULL, &length);		/* eat :unionrelid */
-	token = lsptok(NULL, &length);		/* get unionrelid */
-	local_node->unionrelid = strtoul(token, NULL, 10);
+	token = lsptok(NULL, &length);		/* eat :inheritrelid */
+	token = lsptok(NULL, &length);		/* get inheritrelid */
+	local_node->inheritrelid = strtoul(token, NULL, 10);
 
-	token = lsptok(NULL, &length);		/* eat :unionrtentries */
-	local_node->unionrtentries = nodeRead(true);		/* now read it */
+	token = lsptok(NULL, &length);		/* eat :inheritrtable */
+	local_node->inheritrtable = nodeRead(true);		/* now read it */
 
 	return (local_node);
 }