3 files changed, 6 insertions, 46 deletions
diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c
index be70ef33fdf..87919b4dbab 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.79 1999/05/12 15:01:31 wieck Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.80 1999/05/18 21:34:27 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -357,10 +357,6 @@ _copyHashJoin(HashJoin *from)
 
 	newnode->hashjoinop = from->hashjoinop;
 
-	/* both are unused !.. */
-	newnode->hashjointablekey = from->hashjointablekey;
-	newnode->hashjointablesize = from->hashjointablesize;
-
 	return newnode;
 }
 
@@ -545,10 +541,6 @@ _copyHash(Hash *from)
 	 */
 	Node_Copy(from, newnode, hashkey);
 
-	/* both are unused !.. */
-	newnode->hashtablekey = from->hashtablekey;
-	newnode->hashtablesize = from->hashtablesize;
-
 	return newnode;
 }
 
diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c
index bbab1a4964a..f4fdb63637d 100644
--- a/src/backend/nodes/outfuncs.c
+++ b/src/backend/nodes/outfuncs.c
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- *  $Id: outfuncs.c,v 1.82 1999/05/17 17:03:13 momjian Exp $
+ *  $Id: outfuncs.c,v 1.83 1999/05/18 21:34:28 tgl Exp $
  *
  * NOTES
  *	  Every (plan) node in POSTGRES has an associated "out" routine which
@@ -385,14 +385,11 @@ _outHashJoin(StringInfo str, HashJoin *node)
 	_outNode(str, node->hashclauses);
 
 	appendStringInfo(str, 
-			" :hashjoinop %u :hashjointable 0x%x :hashjointablekey %d ",
-			node->hashjoinop,
-			(int) node->hashjointable,
-			node->hashjointablekey);
+			" :hashjoinop %u ",
+			node->hashjoinop);
 
 	appendStringInfo(str, 
-			" :hashjointablesize %d :hashdone %d ",
-			node->hashjointablesize,
+			" :hashdone %d ",
 			node->hashdone);
 }
 
@@ -536,11 +533,6 @@ _outHash(StringInfo str, Hash *node)
 
 	appendStringInfo(str, " :hashkey ");
 	_outNode(str, node->hashkey);
-
-	appendStringInfo(str, " :hashtable 0x%x :hashtablekey %d :hashtablesize %d ",
-			(int) node->hashtable,
-			node->hashtablekey,
-			node->hashtablesize);
 }
 
 /*****************************************************************************
diff --git a/src/backend/nodes/readfuncs.c b/src/backend/nodes/readfuncs.c
index ab491868ac9..82ccdd2dac9 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.62 1999/05/17 17:03:14 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.63 1999/05/18 21:34:29 tgl Exp $
  *
  * NOTES
  *	  Most of the read functions for plan nodes are tested. (In fact, they
@@ -454,18 +454,6 @@ _readHashJoin()
 	token = lsptok(NULL, &length);		/* get hashjoinop */
 	local_node->hashjoinop = strtoul(token, NULL, 10);
 
-	token = lsptok(NULL, &length);		/* eat :hashjointable */
-	token = lsptok(NULL, &length);		/* eat hashjointable */
-	local_node->hashjointable = NULL;
-
-	token = lsptok(NULL, &length);		/* eat :hashjointablekey */
-	token = lsptok(NULL, &length);		/* eat hashjointablekey */
-	local_node->hashjointablekey = 0;
-
-	token = lsptok(NULL, &length);		/* eat :hashjointablesize */
-	token = lsptok(NULL, &length);		/* eat hashjointablesize */
-	local_node->hashjointablesize = 0;
-
 	token = lsptok(NULL, &length);		/* eat :hashdone */
 	token = lsptok(NULL, &length);		/* eat hashdone */
 	local_node->hashdone = false;
@@ -680,18 +668,6 @@ _readHash()
 	token = lsptok(NULL, &length);		/* eat :hashkey */
 	local_node->hashkey = (Var *) nodeRead(true);
 
-	token = lsptok(NULL, &length);		/* eat :hashtable */
-	token = lsptok(NULL, &length);		/* eat hashtable address */
-	local_node->hashtable = NULL;
-
-	token = lsptok(NULL, &length);		/* eat :hashtablekey */
-	token = lsptok(NULL, &length);		/* get hashtablekey */
-	local_node->hashtablekey = 0;
-
-	token = lsptok(NULL, &length);		/* eat :hashtablesize */
-	token = lsptok(NULL, &length);		/* get hashtablesize */
-	local_node->hashtablesize = 0;
-
 	return local_node;
 }