Merge commit 'abecdda8b13c8e18de72ac9e2e9f3808da7edcae' into PGPROEE9_6

dmpgpro · dmpgpro · commit 261da389666e · 2016-10-19T17:35:13.000+03:00
diff --git a/contrib/rum/rumsort.c b/contrib/rum/rumsort.c
@@ -1157,7 +1157,7 @@ rum_tuplesort_begin_rum(int workMem, int nKeys, bool randomAccess,
 	state->nKeys = nKeys;
 
 	TRACE_POSTGRESQL_SORT_START(INDEX_SORT,
-								enforceUnique,
+								false,	/* no unique check */
 								state->nKeys,
 								workMem,
 								randomAccess);
@@ -1190,7 +1190,7 @@ rum_tuplesort_begin_rumkey(int workMem, FmgrInfo *cmp)
 #endif
 
 	TRACE_POSTGRESQL_SORT_START(INDEX_SORT,
-								enforceUnique,
+								false,	/* no unique check */
 								2,
 								workMem,
 								false);
