Revert changes in execMain.c from commit 16828d5c0273b

These changes were put in at some stage of the development process, but
are unnecessary and should not have made it into the final patch. Mea
culpa.

Per gripe from Andreas Freund

Backpatch to REL_11_STABLE

diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c
index 01e1a46180435a6d66236ab6b88b1b7d82919f40..b797d064b7e046aa3c3ffff4aac73d7266be349d 100644 (file)
--- a/src/backend/executor/execMain.c
+++ b/src/backend/executor/execMain.c
@@ -2986,17 +2986,8 @@ EvalPlanQualFetchRowMarks(EPQState *epqstate)
                                false, NULL))
                    elog(ERROR, "failed to fetch tuple for EvalPlanQual recheck");
 
-               if (HeapTupleHeaderGetNatts(tuple.t_data) <
-                   RelationGetDescr(erm->relation)->natts)
-               {
-                   copyTuple = heap_expand_tuple(&tuple,
-                                                 RelationGetDescr(erm->relation));
-               }
-               else
-               {
-                   /* successful, copy tuple */
-                   copyTuple = heap_copytuple(&tuple);
-               }
+               /* successful, copy tuple */
+               copyTuple = heap_copytuple(&tuple);
                ReleaseBuffer(buffer);
            }