=== Applying patches on top of PostgreSQL commit ID 53a49365052026907afff7613929710d1e7f0da0 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Sat Feb 1 05:45:31 UTC 2025 On branch cf/4748 nothing to commit, working tree clean === applying patch ./v4-0001-Revert-Revert-libpqwalreceiver-Convert-to-libpq-b.patch Applied patch to 'src/backend/replication/libpqwalreceiver/libpqwalreceiver.c' cleanly. [cf/4748 512aa9c472] Revert "Revert "libpqwalreceiver: Convert to libpq-be-fe-helpers.h"" Author: Heikki Linnakangas Date: Tue Jan 23 11:01:03 2024 +0200 1 file changed, 8 insertions(+), 47 deletions(-) === applying patch ./v4-0002-Apply-walrcv_shutdown_deblocking_v2-2.patch.patch /work/patches/./v4-0002-Apply-walrcv_shutdown_deblocking_v2-2.patch.patch:86: trailing whitespace. Applied patch to 'src/backend/replication/libpqwalreceiver/libpqwalreceiver.c' cleanly. Applied patch to 'src/backend/replication/walreceiver.c' cleanly. Applied patch to 'src/backend/tcop/postgres.c' with conflicts. Applied patch to 'src/include/replication/walreceiver.h' with conflicts. U src/backend/tcop/postgres.c U src/include/replication/walreceiver.h warning: 1 line adds whitespace errors. diff --cc src/backend/tcop/postgres.c index 5655348a2e,2ce24d8a9a..0000000000 --- a/src/backend/tcop/postgres.c +++ b/src/backend/tcop/postgres.c @@@ -3308,7 -3287,11 +3309,15 @@@ ProcessInterrupts(void */ proc_exit(1); } ++<<<<<<< ours + else if (AmBackgroundWorkerProcess()) ++======= + else if (IsWalReceiver()) + ereport(FATAL, + (errcode(ERRCODE_ADMIN_SHUTDOWN), + errmsg("terminating walreceiver process due to administrator command"))); + else if (IsBackgroundWorker) ++>>>>>>> theirs ereport(FATAL, (errcode(ERRCODE_ADMIN_SHUTDOWN), errmsg("terminating background worker \"%s\" due to administrator command", diff --cc src/include/replication/walreceiver.h index 204419bd8a,916d7b84fe..0000000000 --- a/src/include/replication/walreceiver.h +++ b/src/include/replication/walreceiver.h @@@ -486,8 -470,8 +486,13 @@@ walrcv_clear_result(WalRcvExecResult *w } /* prototypes for functions in walreceiver.c */ ++<<<<<<< ours +extern void WalReceiverMain(char *startup_data, size_t startup_data_len) pg_attribute_noreturn(); +extern void ProcessWalRcvInterrupts(void); ++======= + extern bool IsWalReceiver(void); + extern void WalReceiverMain(void) pg_attribute_noreturn(); ++>>>>>>> theirs extern void WalRcvForceReply(void); /* prototypes for functions in walreceiverfuncs.c */