diff --git a/src/backend/executor/execQual.c b/src/backend/executor/execQual.c
index fed6176cbe5..4b177d25329 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.199.2.4 2009/12/29 17:41:25 heikki Exp $
+ *	  $PostgreSQL: pgsql/src/backend/executor/execQual.c,v 1.199.2.5 2010/08/26 18:55:06 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1632,6 +1632,16 @@ ExecMakeTableFunctionResult(ExprState *funcexpr,
 
 				td = DatumGetHeapTupleHeader(result);
 
+				/*
+				 * Verify all returned rows have same subtype; necessary in
+				 * case the type is RECORD.
+				 */
+				if (HeapTupleHeaderGetTypeId(td) != tupdesc->tdtypeid ||
+					HeapTupleHeaderGetTypMod(td) != tupdesc->tdtypmod)
+					ereport(ERROR,
+							(errcode(ERRCODE_DATATYPE_MISMATCH),
+							 errmsg("rows returned by function are not all of the same row type")));
+
 				/*
 				 * tuplestore_puttuple needs a HeapTuple not a bare
 				 * HeapTupleHeader, but it doesn't need all the fields.