=== Applying patches on top of PostgreSQL commit ID 16a4b3ef8eebd2f3da44c17523fef23d2de80679 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Wed Jul 8 08:56:33 UTC 2026 On branch cf/5829 nothing to commit, working tree clean === using 'git am' to apply patch ./v20260210-0001-VCI-changes-to-postgres-core.patch === Applying: VCI - changes to postgres core Using index info to reconstruct a base tree... M src/backend/access/heap/heapam.c M src/backend/access/heap/heapam_handler.c M src/backend/access/heap/heapam_visibility.c M src/backend/access/transam/xlogfuncs.c M src/backend/access/transam/xlogrecovery.c M src/backend/catalog/dependency.c M src/backend/catalog/index.c M src/backend/commands/explain.c M src/backend/commands/tablecmds.c M src/backend/commands/vacuum.c M src/backend/executor/execAmi.c M src/backend/executor/execExpr.c M src/backend/executor/execExprInterp.c M src/backend/executor/execProcnode.c M src/backend/executor/nodeCustom.c M src/backend/executor/nodeModifyTable.c M src/backend/jit/llvm/llvmjit_expr.c M src/backend/nodes/gen_node_support.pl M src/backend/optimizer/path/allpaths.c M src/backend/optimizer/plan/createplan.c M src/backend/storage/ipc/procarray.c M src/backend/utils/adt/timestamp.c M src/backend/utils/cache/relcache.c M src/bin/pg_dump/common.c M src/bin/pg_dump/pg_dump.c M src/bin/pg_dump/pg_dump.h M src/include/access/heapam.h M src/include/access/xlogrecovery.h M src/include/catalog/index.h M src/include/commands/explain.h M src/include/commands/tablecmds.h M src/include/executor/execExpr.h M src/include/nodes/plannodes.h M src/include/optimizer/planner.h M src/include/utils/relcache.h Falling back to patching base and 3-way merge... Auto-merging src/include/utils/relcache.h Auto-merging src/include/optimizer/planner.h Auto-merging src/include/nodes/plannodes.h Auto-merging src/include/executor/execExpr.h Auto-merging src/include/commands/tablecmds.h Auto-merging src/include/commands/explain.h Auto-merging src/include/catalog/index.h Auto-merging src/include/access/xlogrecovery.h Auto-merging src/include/access/heapam.h Auto-merging src/bin/pg_dump/pg_dump.h Auto-merging src/bin/pg_dump/pg_dump.c Auto-merging src/bin/pg_dump/common.c Auto-merging src/backend/utils/cache/relcache.c Auto-merging src/backend/utils/adt/timestamp.c Auto-merging src/backend/storage/ipc/procarray.c Auto-merging src/backend/optimizer/plan/createplan.c Auto-merging src/backend/optimizer/path/allpaths.c Auto-merging src/backend/nodes/gen_node_support.pl Auto-merging src/backend/jit/llvm/llvmjit_expr.c Auto-merging src/backend/executor/nodeModifyTable.c Auto-merging src/backend/executor/nodeCustom.c Auto-merging src/backend/executor/execProcnode.c Auto-merging src/backend/executor/execExprInterp.c Auto-merging src/backend/executor/execExpr.c Auto-merging src/backend/executor/execAmi.c Auto-merging src/backend/commands/vacuum.c Auto-merging src/backend/commands/tablecmds.c Auto-merging src/backend/commands/explain.c Auto-merging src/backend/catalog/index.c Auto-merging src/backend/catalog/dependency.c Auto-merging src/backend/access/transam/xlogrecovery.c Auto-merging src/backend/access/transam/xlogfuncs.c CONFLICT (content): Merge conflict in src/backend/access/transam/xlogfuncs.c Auto-merging src/backend/access/heap/heapam_visibility.c Auto-merging src/backend/access/heap/heapam_handler.c Auto-merging src/backend/access/heap/heapam.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 VCI - changes to postgres core 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". === using patch(1) to apply patch ./v20260210-0001-VCI-changes-to-postgres-core.patch === patching file src/backend/access/heap/heapam.c Hunk #1 succeeded at 56 with fuzz 1 (offset 2 lines). Hunk #2 succeeded at 2737 (offset -123 lines). Hunk #3 succeeded at 2985 (offset -122 lines). Hunk #4 succeeded at 3142 (offset -112 lines). Hunk #5 succeeded at 3251 (offset -108 lines). Hunk #6 succeeded at 3698 (offset -108 lines). Hunk #7 succeeded at 4186 (offset -105 lines). patching file src/backend/access/heap/heapam_handler.c Hunk #1 succeeded at 48 with fuzz 2 (offset 2 lines). Hunk #2 succeeded at 1626 (offset -49 lines). patching file src/backend/access/heap/heapam_visibility.c Hunk #1 succeeded at 78 with fuzz 1. Hunk #2 succeeded at 1749 (offset 77 lines). patching file src/backend/access/transam/xlogfuncs.c Hunk #1 succeeded at 63 (offset -544 lines). patching file src/backend/access/transam/xlogrecovery.c Hunk #1 succeeded at 2913 (offset -56 lines). Hunk #2 succeeded at 3080 (offset -56 lines). Hunk #3 succeeded at 3101 (offset -56 lines). patching file src/backend/catalog/dependency.c Hunk #1 succeeded at 91 (offset 5 lines). Hunk #2 succeeded at 1424 (offset 16 lines). patching file src/backend/catalog/index.c Hunk #1 succeeded at 134 (offset 1 line). Hunk #2 succeeded at 344 (offset 1 line). Hunk #3 succeeded at 3719 (offset 23 lines). patching file src/backend/commands/explain.c Hunk #1 succeeded at 1215 (offset 5 lines). Hunk #2 succeeded at 1519 (offset 5 lines). Hunk #3 succeeded at 1683 (offset 5 lines). Hunk #4 succeeded at 2170 (offset 9 lines). Hunk #5 succeeded at 2432 (offset 9 lines). Hunk #6 succeeded at 4627 (offset 179 lines). Hunk #7 succeeded at 5335 (offset 205 lines). patching file src/backend/commands/tablecmds.c Hunk #1 succeeded at 113 (offset 3 lines). Hunk #2 succeeded at 16828 (offset 500 lines). Hunk #3 succeeded at 17380 (offset 500 lines). Hunk #4 succeeded at 17507 (offset 500 lines). Hunk #5 succeeded at 19764 (offset 499 lines). patching file src/backend/commands/vacuum.c Hunk #1 succeeded at 132 (offset 1 line). Hunk #2 succeeded at 2142 (offset 10 lines). patching file src/backend/executor/execAmi.c Hunk #1 succeeded at 438 (offset 1 line). Hunk #2 succeeded at 565 (offset 1 line). patching file src/backend/executor/execExpr.c patching file src/backend/executor/execExprInterp.c Hunk #1 succeeded at 198 (offset 10 lines). Hunk #2 succeeded at 617 (offset 10 lines). Hunk #3 succeeded at 2292 (offset 10 lines). patching file src/backend/executor/execProcnode.c patching file src/backend/executor/execScan.c patching file src/backend/executor/nodeCustom.c patching file src/backend/executor/nodeModifyTable.c Hunk #1 succeeded at 77 (offset 5 lines). Hunk #2 succeeded at 2622 with fuzz 2 (offset 288 lines). patching file src/backend/jit/llvm/llvmjit_expr.c Hunk #1 succeeded at 2942 (offset 2 lines). patching file src/backend/jit/llvm/llvmjit_types.c patching file src/backend/nodes/gen_node_support.pl Hunk #1 succeeded at 139 (offset -14 lines). Hunk #2 succeeded at 657 (offset -23 lines). Hunk #3 succeeded at 680 (offset -23 lines). patching file src/backend/optimizer/path/allpaths.c Hunk #2 succeeded at 839 (offset 16 lines). Hunk #3 succeeded at 866 (offset 16 lines). patching file src/backend/optimizer/plan/createplan.c Hunk #1 succeeded at 33 (offset 1 line). Hunk #2 succeeded at 174 (offset 1 line). Hunk #3 succeeded at 5399 (offset 31 lines). patching file src/backend/storage/ipc/procarray.c Hunk #1 succeeded at 1916 (offset -6 lines). patching file src/backend/utils/adt/timestamp.c Hunk #2 succeeded at 65 (offset -9 lines). Hunk #3 succeeded at 3491 (offset 19 lines). Hunk #4 succeeded at 3970 (offset 19 lines). patching file src/backend/utils/cache/relcache.c Hunk #1 succeeded at 95 (offset 3 lines). Hunk #2 succeeded at 5401 (offset 15 lines). Hunk #3 succeeded at 7014 (offset 40 lines). patching file src/bin/pg_dump/common.c Hunk #1 succeeded at 671 (offset 3 lines). patching file src/bin/pg_dump/pg_dump.c Hunk #1 succeeded at 8598 (offset -45 lines). Hunk #2 succeeded at 17071 (offset -50 lines). Hunk #3 succeeded at 20441 (offset 7 lines). patching file src/bin/pg_dump/pg_dump.h patching file src/include/access/heapam.h Hunk #1 succeeded at 464 with fuzz 1 (offset 34 lines). patching file src/include/access/xlogrecovery.h Hunk #1 succeeded at 58 with fuzz 1 (offset 2 lines). Hunk #2 succeeded at 226 (offset 64 lines). patching file src/include/catalog/dependency.h patching file src/include/catalog/index.h Hunk #1 succeeded at 182 (offset 7 lines). patching file src/include/commands/explain.h Hunk #1 succeeded at 82 (offset 1 line). patching file src/include/commands/tablecmds.h patching file src/include/datatype/timestamp.h patching file src/include/executor/execExpr.h Hunk #4 succeeded at 910 (offset 4 lines). patching file src/include/executor/nodeModifyTable.h patching file src/include/nodes/extensible.h patching file src/include/nodes/params.h patching file src/include/nodes/plannodes.h Hunk #1 succeeded at 220 (offset 6 lines). patching file src/include/optimizer/planner.h Hunk #1 succeeded at 54 (offset 1 line). patching file src/include/utils/relcache.h Hunk #1 succeeded at 62 (offset 1 line). Hunk #2 succeeded at 163 (offset 1 line). patching file src/include/utils/snapshot.h [cf/5829 6b8b173a40b] VCI - changes to postgres core Author: Peter Smith Date: Tue Feb 10 18:28:04 2026 +1100 43 files changed, 577 insertions(+), 44 deletions(-) === using 'git am' to apply patch ./v20260210-0002-VCI-main-part1.patch === Applying: VCI - main - part1 === using 'git am' to apply patch ./v20260210-0003-VCI-main-part2.patch === Applying: VCI - main - part2 === using 'git am' to apply patch ./v20260210-0004-VCI-main-part3.patch === Applying: VCI - main - part3 === using 'git am' to apply patch ./v20260210-0005-VCI-main-part4.patch === Applying: VCI - main - part4 === using 'git am' to apply patch ./v20260210-0006-VCI-main-part5.patch === Applying: VCI - main - part5 === using 'git am' to apply patch ./v20260210-0007-VCI-main-part6.patch === Applying: VCI - main - part6 === using 'git am' to apply patch ./v20260210-0008-VCI-tests.patch === Applying: VCI tests === using 'git am' to apply patch ./v20260210-0009-VCI-docs.patch === Applying: VCI docs