Merge branch 'xtm' of https://gitlab.postgrespro.ru/pgpro-dev/postgrespro into xtm

Author: knizhnik

contrib/file_fdw/file_fdw.c

@@ -563,7 +563,8 @@ fileGetForeignPlan(PlannerInfo *root,
 							scan_relid,
 							NIL,	/* no expressions to evaluate */
 							best_path->fdw_private,
-							NIL /* no custom tlist */ );
+							NIL,	/* no custom tlist */
+							NIL /* no remote quals */ );
 }
 
 /*

contrib/pg_dtm/dtmd/include/eventwrap.h

@@ -12,7 +12,6 @@ typedef struct Snapshot {
 	int times_sent;
 } Snapshot;
 
-char *snapshot_serialize(Snapshot *s);
 void snapshot_sort(Snapshot *s);
 
 #endif

contrib/pg_dtm/dtmd/include/intset.h

@@ -15,7 +15,6 @@
 char *join_path(const char *dir, const char *file);
 bool inrange(xid_t min, xid_t x, xid_t max);
 int falloc(int fd, off64_t size);
-char *destructive_concat(char *a, char *b);
 
 #ifndef DEBUG
 #define debug(...)