4 files changed, 28 insertions, 17 deletions
diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c
index 49af1f90c8..4de9ba5b8d 100644
--- a/src/backend/nodes/copyfuncs.c
+++ b/src/backend/nodes/copyfuncs.c
@@ -15,7 +15,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.205 2002/08/24 15:00:46 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.206 2002/08/26 17:53:57 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1056,10 +1056,11 @@ _copyArrayRef(ArrayRef *from)
 	/*
 	 * copy remainder of node
 	 */
+	newnode->refrestype = from->refrestype;
 	newnode->refattrlength = from->refattrlength;
 	newnode->refelemlength = from->refelemlength;
-	newnode->refelemtype = from->refelemtype;
 	newnode->refelembyval = from->refelembyval;
+	newnode->refelemalign = from->refelemalign;
 
 	Node_Copy(from, newnode, refupperindexpr);
 	Node_Copy(from, newnode, reflowerindexpr);
diff --git a/src/backend/nodes/equalfuncs.c b/src/backend/nodes/equalfuncs.c
index 9990a04622..c96389f1e8 100644
--- a/src/backend/nodes/equalfuncs.c
+++ b/src/backend/nodes/equalfuncs.c
@@ -20,7 +20,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.153 2002/08/19 15:08:46 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.154 2002/08/26 17:53:57 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -258,7 +258,7 @@ _equalSubLink(SubLink *a, SubLink *b)
 static bool
 _equalArrayRef(ArrayRef *a, ArrayRef *b)
 {
-	if (a->refelemtype != b->refelemtype)
+	if (a->refrestype != b->refrestype)
 		return false;
 	if (a->refattrlength != b->refattrlength)
 		return false;
@@ -266,13 +266,17 @@ _equalArrayRef(ArrayRef *a, ArrayRef *b)
 		return false;
 	if (a->refelembyval != b->refelembyval)
 		return false;
+	if (a->refelemalign != b->refelemalign)
+		return false;
 	if (!equal(a->refupperindexpr, b->refupperindexpr))
 		return false;
 	if (!equal(a->reflowerindexpr, b->reflowerindexpr))
 		return false;
 	if (!equal(a->refexpr, b->refexpr))
 		return false;
-	return equal(a->refassgnexpr, b->refassgnexpr);
+	if (!equal(a->refassgnexpr, b->refassgnexpr))
+		return false;
+	return true;
 }
 
 static bool
diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c
index 1a610b7c7c..3a40775339 100644
--- a/src/backend/nodes/outfuncs.c
+++ b/src/backend/nodes/outfuncs.c
@@ -5,7 +5,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- *	$Header: /cvsroot/pgsql/src/backend/nodes/outfuncs.c,v 1.168 2002/08/19 15:08:46 tgl Exp $
+ *	$Header: /cvsroot/pgsql/src/backend/nodes/outfuncs.c,v 1.169 2002/08/26 17:53:58 tgl Exp $
  *
  * NOTES
  *	  Every (plan) node in POSTGRES has an associated "out" routine which
@@ -831,16 +831,18 @@ static void
 _outArrayRef(StringInfo str, ArrayRef *node)
 {
 	appendStringInfo(str,
-		" ARRAYREF :refelemtype %u :refattrlength %d :refelemlength %d ",
-					 node->refelemtype,
+		" ARRAYREF :refrestype %u :refattrlength %d :refelemlength %d ",
+					 node->refrestype,
 					 node->refattrlength,
 					 node->refelemlength);
 
-	appendStringInfo(str, " :refelembyval %c :refupperindex ",
-					 node->refelembyval ? 't' : 'f');
+	appendStringInfo(str,
+					 ":refelembyval %s :refelemalign %c :refupperindexpr ",
+					 booltostr(node->refelembyval),
+					 node->refelemalign);
 	_outNode(str, node->refupperindexpr);
 
-	appendStringInfo(str, " :reflowerindex ");
+	appendStringInfo(str, " :reflowerindexpr ");
 	_outNode(str, node->reflowerindexpr);
 
 	appendStringInfo(str, " :refexpr ");
diff --git a/src/backend/nodes/readfuncs.c b/src/backend/nodes/readfuncs.c
index fbf959931e..b54a70159c 100644
--- a/src/backend/nodes/readfuncs.c
+++ b/src/backend/nodes/readfuncs.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.128 2002/08/10 20:44:48 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.129 2002/08/26 17:53:58 tgl Exp $
  *
  * NOTES
  *	  Most of the read functions for plan nodes are tested. (In fact, they
@@ -992,9 +992,9 @@ _readArrayRef(void)
 
 	local_node = makeNode(ArrayRef);
 
-	token = pg_strtok(&length); /* eat :refelemtype */
-	token = pg_strtok(&length); /* get refelemtype */
-	local_node->refelemtype = atooid(token);
+	token = pg_strtok(&length); /* eat :refrestype */
+	token = pg_strtok(&length); /* get refrestype */
+	local_node->refrestype = atooid(token);
 
 	token = pg_strtok(&length); /* eat :refattrlength */
 	token = pg_strtok(&length); /* get refattrlength */
@@ -1008,10 +1008,14 @@ _readArrayRef(void)
 	token = pg_strtok(&length); /* get refelembyval */
 	local_node->refelembyval = strtobool(token);
 
-	token = pg_strtok(&length); /* eat :refupperindex */
+	token = pg_strtok(&length); /* eat :refelemalign */
+	token = pg_strtok(&length); /* get refelemalign */
+	local_node->refelemalign = token[0];
+
+	token = pg_strtok(&length); /* eat :refupperindexpr */
 	local_node->refupperindexpr = nodeRead(true);
 
-	token = pg_strtok(&length); /* eat :reflowerindex */
+	token = pg_strtok(&length); /* eat :reflowerindexpr */
 	local_node->reflowerindexpr = nodeRead(true);
 
 	token = pg_strtok(&length); /* eat :refexpr */