diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c
index 2ba59ab5e9eef051e61a71f2c85c289891292708..fc0a85d2ddd8424dafe1f319b54a0dbaee6f7f14 100644
--- a/src/backend/access/common/heaptuple.c
+++ b/src/backend/access/common/heaptuple.c
@@ -16,7 +16,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/access/common/heaptuple.c,v 1.100 2005/10/15 02:49:08 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/access/common/heaptuple.c,v 1.101 2005/10/19 18:18:32 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -27,6 +27,7 @@
 #include "access/tuptoaster.h"
 #include "catalog/pg_type.h"
 #include "executor/tuptable.h"
+#include "utils/typcache.h"
 
 
 /* ----------------------------------------------------------------
@@ -603,11 +604,18 @@ heap_getsysattr(HeapTuple tup, int attnum, TupleDesc tupleDesc, bool *isnull)
 			 *
 			 * We have to make a copy of the tuple so we can safely insert the
 			 * Datum overhead fields, which are not set in on-disk tuples.
+			 *
+			 * It's possible that the passed tupleDesc is a record type that
+			 * hasn't been "blessed" yet, so cover that case.
 			 */
 		case InvalidAttrNumber:
 			{
 				HeapTupleHeader dtup;
 
+				if (tupleDesc->tdtypeid == RECORDOID &&
+					tupleDesc->tdtypmod < 0)
+					assign_record_type_typmod(tupleDesc);
+
 				dtup = (HeapTupleHeader) palloc(tup->t_len);
 				memcpy((char *) dtup, (char *) tup->t_data, tup->t_len);
 
diff --git a/src/backend/executor/execQual.c b/src/backend/executor/execQual.c
index d535e6453d5ce1ab27ab9da8b9ab7f6c45f395e6..5a270469061d1fc906252c3c51807896d49d8f9b 100644
--- a/src/backend/executor/execQual.c
+++ b/src/backend/executor/execQual.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/executor/execQual.c,v 1.181 2005/10/15 02:49:16 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/executor/execQual.c,v 1.182 2005/10/19 18:18:33 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -3180,7 +3180,7 @@ ExecInitExpr(Expr *node, PlanState *parent)
 				{
 					/* generic record, use runtime type assignment */
 					rstate->tupdesc = ExecTypeFromExprList(rowexpr->args);
-					rstate->tupdesc = BlessTupleDesc(rstate->tupdesc);
+					BlessTupleDesc(rstate->tupdesc);
 				}
 				else
 				{