resolve crashes in queries involving merge-sort in a RemoteSubplan

diff --git a/src/backend/utils/sort/tuplesort.c b/src/backend/utils/sort/tuplesort.c
index 3c16282b307100b65417cc3de7a5f1e7e87bd32c..d2ba7d968c1eda99b813ea4880d1543ea8691e94 100644 (file)
--- a/src/backend/utils/sort/tuplesort.c
+++ b/src/backend/utils/sort/tuplesort.c
@@ -1176,7 +1176,9 @@ tuplesort_begin_merge(TupleDesc tupDesc,
        state->writetup = NULL;
        state->readtup = readtup_datanode;
        state->getlen = getlen_datanode;
-       state->movetup = movetup_heap;
+
+       state->tuples = false;
+       state->batchUsed = false;
 
        state->tupDesc = tupDesc;       /* assume we need not copy tupDesc */
        state->sortKeys = (SortSupport) palloc0(nkeys * sizeof(SortSupportData));