Assorted compilation and test fixes

related to 7c4f52409a8c7d85ed169bbbc1f6092274d03920, per build farm

Author: Petr Jelinek <petr.jelinek@2ndquadrant.com>

diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c
index 67c7de670bb39f0321cc00b235d3624bcdbd7676..93d4eb207f1f8f748e3f72dd3667e6f5cbb4d0aa 100644 (file)
--- 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
index 4d8e7fe9b0051d85843690db618ba9464fab1984..6b40b56f71ee35f989f8e07cd32d934927b895a6 100644 (file)
--- 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
index bf96d340caacfde373904df43703c6162a5eebea..5bebca34ef86148294d0ea7a158724f61196c2e9 100644 (file)
--- 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;