Minor fixes after cherry pick from ee.

arssher · arssher · commit c258c0471a8e · 2021-02-28T17:33:14.000+03:00
diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
@@ -119,7 +119,7 @@ typedef struct OnCommitItem
 	SubTransactionId deleting_subid;
 } OnCommitItem;
 
-static List *on_commits = NIL;
+List *on_commits = NIL;
 
 
 /*
diff --git a/src/include/c.h b/src/include/c.h
@@ -531,6 +531,9 @@ typedef uint32 SubTransactionId;
 #define InvalidSubTransactionId		((SubTransactionId) 0)
 #define TopSubTransactionId			((SubTransactionId) 1)
 
+/* stub for making core patches more compatible with pgproee */
+#define XID_FMT "%u"
+
 /* MultiXactId must be equivalent to TransactionId, to fit in t_xmax */
 typedef TransactionId MultiXactId;
 
diff --git a/src/include/commands/tablecmds.h b/src/include/commands/tablecmds.h
@@ -23,6 +23,7 @@
 
 struct AlterTableUtilityContext;	/* avoid including tcop/utility.h here */
 
+extern PGDLLIMPORT List* on_commits;
 
 extern ObjectAddress DefineRelation(CreateStmt *stmt, char relkind, Oid ownerId,
 									ObjectAddress *typaddress, const char *queryString);
diff --git a/src/include/replication/walsender.h b/src/include/replication/walsender.h
@@ -13,6 +13,7 @@
 #define _WALSENDER_H
 
 #include <signal.h>
+#include <access/xlogdefs.h>
 
 /*
  * What to do with a snapshot in create replication slot command.
