Assorted compilation and test fixes

petere · petere · commit 128e6ee01dc9 · 2017-03-23T11:44:43.000-04:00
related to 7c4f524, per build farm Author: Petr Jelinek <petr.jelinek@2ndquadrant.com>
diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c
@@ -4450,7 +4450,10 @@ _copyAlterSubscriptionStmt(const AlterSubscriptionStmt *from)
 {
 	AlterSubscriptionStmt *newnode = makeNode(AlterSubscriptionStmt);
 
+	COPY_SCALAR_FIELD(kind);
 	COPY_STRING_FIELD(subname);
+	COPY_STRING_FIELD(conninfo);
+	COPY_NODE_FIELD(publication);
 	COPY_NODE_FIELD(options);
 
 	return newnode;
diff --git a/src/backend/nodes/equalfuncs.c b/src/backend/nodes/equalfuncs.c
@@ -2199,7 +2199,10 @@ static bool
 _equalAlterSubscriptionStmt(const AlterSubscriptionStmt *a,
 							const AlterSubscriptionStmt *b)
 {
+	COMPARE_SCALAR_FIELD(kind);
 	COMPARE_STRING_FIELD(subname);
+	COMPARE_STRING_FIELD(conninfo);
+	COMPARE_NODE_FIELD(publication);
 	COMPARE_NODE_FIELD(options);
 
 	return true;
diff --git a/src/include/replication/worker_internal.h b/src/include/replication/worker_internal.h
@@ -46,7 +46,7 @@ typedef struct LogicalRepWorker
 } LogicalRepWorker;
 
 /* Memory context for cached variables in apply worker. */
-MemoryContext			ApplyCacheContext;
+extern MemoryContext				ApplyCacheContext;
 
 /* libpqreceiver connection */
 extern struct WalReceiverConn	   *wrconn;

Original file line number	Diff line number	Diff line change
`@@ -4450,7 +4450,10 @@ _copyAlterSubscriptionStmt(const AlterSubscriptionStmt *from)`
`4450`	`4450`	`{`
`4451`	`4451`	`AlterSubscriptionStmt *newnode = makeNode(AlterSubscriptionStmt);`
`4452`	`4452`
	`4453`	`+ COPY_SCALAR_FIELD(kind);`
`4453`	`4454`	`COPY_STRING_FIELD(subname);`
	`4455`	`+ COPY_STRING_FIELD(conninfo);`
	`4456`	`+ COPY_NODE_FIELD(publication);`
`4454`	`4457`	`COPY_NODE_FIELD(options);`
`4455`	`4458`
`4456`	`4459`	`return newnode;`