=== Applying patches on top of PostgreSQL commit ID 3a36543d7d08eef6496fe3511f4cf04cba14f572 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Fri Oct 10 18:00:21 UTC 2025
On branch cf/5903
nothing to commit, working tree clean
=== using 'git am' to apply patch ./REL15_v5-0001-Fix-access-to-already-freed-memory-issue-in-pgout.patch ===
Applying: Fix access-to-already-freed-memory issue in pgoutput.
Using index info to reconstruct a base tree...
M	src/backend/replication/pgoutput/pgoutput.c
Falling back to patching base and 3-way merge...
Auto-merging src/backend/replication/pgoutput/pgoutput.c
CONFLICT (content): Merge conflict in src/backend/replication/pgoutput/pgoutput.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix access-to-already-freed-memory issue in pgoutput.
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Unstaged changes after reset:
M	src/backend/replication/pgoutput/pgoutput.c
=== using patch(1) to apply patch ./REL15_v5-0001-Fix-access-to-already-freed-memory-issue-in-pgout.patch ===
patching file src/backend/replication/pgoutput/pgoutput.c
Hunk #1 FAILED at 232.
Hunk #2 FAILED at 393.
Hunk #3 FAILED at 426.
Hunk #4 FAILED at 1761.
4 out of 4 hunks FAILED -- saving rejects to file src/backend/replication/pgoutput/pgoutput.c.rej
Removing src/backend/replication/pgoutput/pgoutput.c.rej
=== using 'git apply' to apply patch ./REL15_v5-0001-Fix-access-to-already-freed-memory-issue-in-pgout.patch ===
Applied patch to 'src/backend/replication/pgoutput/pgoutput.c' with conflicts.
U src/backend/replication/pgoutput/pgoutput.c
diff --cc src/backend/replication/pgoutput/pgoutput.c
index 847806b0a2e,f3acc64c451..00000000000
--- a/src/backend/replication/pgoutput/pgoutput.c
+++ b/src/backend/replication/pgoutput/pgoutput.c
@@@ -438,6 -404,9 +438,12 @@@ pgoutput_memory_context_reset(void *arg
  		hash_destroy(RelationSyncCache);
  		RelationSyncCache = NULL;
  	}
++<<<<<<< ours
++=======
+ 
+ 	/* Better safe than sorry */
+ 	pubctx = NULL;
++>>>>>>> theirs
  }
  
  /*