From: Tomas Vondra <tomas@2ndquadrant.com>
Date: Tue, 17 Jan 2017 20:06:37 +0000 (+0100)
Subject: resolve crashes in queries involving merge-sort in a RemoteSubplan
X-Git-Tag: XL_10_R1BETA1~453
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=1254705beb70e86c8f96730a024b61f013b5a432;p=postgres-xl.git

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 3c16282b30..d2ba7d968c 100644
--- 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));