=== Applying patches on top of PostgreSQL commit ID 0916282a0606fb788634738bab5b9f0bbde2aa08 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Fri May 1 05:03:23 UTC 2026 On branch cf/6724 nothing to commit, working tree clean === using 'git am' to apply patch ./v3-0001-Add-join-MCV-statistics-for-selectivity-estimatio.patch === Applying: Add join MCV statistics for selectivity estimation Using index info to reconstruct a base tree... M src/backend/parser/parse_utilcmd.c M src/backend/utils/adt/ruleutils.c M src/include/catalog/catversion.h M src/test/regress/parallel_schedule Falling back to patching base and 3-way merge... Auto-merging src/test/regress/parallel_schedule Auto-merging src/include/catalog/catversion.h CONFLICT (content): Merge conflict in src/include/catalog/catversion.h Auto-merging src/backend/utils/adt/ruleutils.c Auto-merging src/backend/parser/parse_utilcmd.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 Add join MCV statistics for selectivity estimation 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 ./v3-0001-Add-join-MCV-statistics-for-selectivity-estimatio.patch === patching file src/backend/catalog/system_views.sql patching file src/backend/commands/statscmds.c patching file src/backend/optimizer/path/clausesel.c patching file src/backend/optimizer/path/costsize.c patching file src/backend/optimizer/util/plancat.c patching file src/backend/parser/gram.y patching file src/backend/parser/parse_utilcmd.c Hunk #1 succeeded at 3146 (offset 4 lines). Hunk #2 succeeded at 3200 (offset 4 lines). Hunk #3 succeeded at 3211 (offset 4 lines). Hunk #4 succeeded at 3344 (offset 4 lines). patching file src/backend/statistics/Makefile patching file src/backend/statistics/extended_stats.c patching file src/backend/statistics/join_mcv.c patching file src/backend/statistics/meson.build patching file src/backend/tcop/utility.c patching file src/backend/utils/adt/ruleutils.c patching file src/bin/psql/describe.c patching file src/include/catalog/catversion.h Hunk #1 FAILED at 57. 1 out of 1 hunk FAILED -- saving rejects to file src/include/catalog/catversion.h.rej patching file src/include/catalog/pg_proc.dat patching file src/include/catalog/pg_statistic_ext.h patching file src/include/nodes/parsenodes.h patching file src/include/nodes/pathnodes.h patching file src/include/statistics/extended_stats_internal.h patching file src/include/statistics/statistics.h patching file src/test/regress/expected/oidjoins.out patching file src/test/regress/expected/rules.out patching file src/test/regress/expected/stats_ext.out patching file src/test/regress/expected/stats_ext_crossrel.out patching file src/test/regress/parallel_schedule patching file src/test/regress/sql/oidjoins.sql patching file src/test/regress/sql/stats_ext_crossrel.sql Unstaged changes after reset: M src/backend/catalog/system_views.sql M src/backend/commands/statscmds.c M src/backend/optimizer/path/clausesel.c M src/backend/optimizer/path/costsize.c M src/backend/optimizer/util/plancat.c M src/backend/parser/gram.y M src/backend/parser/parse_utilcmd.c M src/backend/statistics/Makefile M src/backend/statistics/extended_stats.c M src/backend/statistics/meson.build M src/backend/tcop/utility.c M src/backend/utils/adt/ruleutils.c M src/bin/psql/describe.c M src/include/catalog/pg_proc.dat M src/include/catalog/pg_statistic_ext.h M src/include/nodes/parsenodes.h M src/include/nodes/pathnodes.h M src/include/statistics/extended_stats_internal.h M src/include/statistics/statistics.h M src/test/regress/expected/oidjoins.out M src/test/regress/expected/rules.out M src/test/regress/expected/stats_ext.out M src/test/regress/parallel_schedule M src/test/regress/sql/oidjoins.sql Removing src/backend/statistics/join_mcv.c Removing src/include/catalog/catversion.h.rej Removing src/test/regress/expected/stats_ext_crossrel.out Removing src/test/regress/sql/stats_ext_crossrel.sql === using 'git apply' to apply patch ./v3-0001-Add-join-MCV-statistics-for-selectivity-estimatio.patch === Applied patch to 'src/backend/catalog/system_views.sql' cleanly. Applied patch to 'src/backend/commands/statscmds.c' cleanly. Applied patch to 'src/backend/optimizer/path/clausesel.c' cleanly. Applied patch to 'src/backend/optimizer/path/costsize.c' cleanly. Applied patch to 'src/backend/optimizer/util/plancat.c' cleanly. Applied patch to 'src/backend/parser/gram.y' cleanly. Applied patch to 'src/backend/parser/parse_utilcmd.c' cleanly. Applied patch to 'src/backend/statistics/Makefile' cleanly. Applied patch to 'src/backend/statistics/extended_stats.c' cleanly. Falling back to direct application... Applied patch to 'src/backend/statistics/meson.build' cleanly. Applied patch to 'src/backend/tcop/utility.c' cleanly. Applied patch to 'src/backend/utils/adt/ruleutils.c' cleanly. Applied patch to 'src/bin/psql/describe.c' cleanly. Applied patch to 'src/include/catalog/catversion.h' with conflicts. Applied patch to 'src/include/catalog/pg_proc.dat' cleanly. Applied patch to 'src/include/catalog/pg_statistic_ext.h' cleanly. Applied patch to 'src/include/nodes/parsenodes.h' cleanly. Applied patch to 'src/include/nodes/pathnodes.h' cleanly. Applied patch to 'src/include/statistics/extended_stats_internal.h' cleanly. Applied patch to 'src/include/statistics/statistics.h' cleanly. Applied patch to 'src/test/regress/expected/oidjoins.out' cleanly. Applied patch to 'src/test/regress/expected/rules.out' cleanly. Applied patch to 'src/test/regress/expected/stats_ext.out' cleanly. Falling back to direct application... Applied patch to 'src/test/regress/parallel_schedule' cleanly. Applied patch to 'src/test/regress/sql/oidjoins.sql' cleanly. Falling back to direct application... U src/include/catalog/catversion.h diff --cc src/include/catalog/catversion.h index 8d5924a32f2,ef0a3b1ff66..00000000000 --- a/src/include/catalog/catversion.h +++ b/src/include/catalog/catversion.h @@@ -57,6 -57,6 +57,10 @@@ */ /* yyyymmddN */ ++<<<<<<< ours +#define CATALOG_VERSION_NO 202605011 ++======= + #define CATALOG_VERSION_NO 202604251 ++>>>>>>> theirs #endif