=== Applying patches on top of PostgreSQL commit ID 322bab79744dfb8f7ddb5191b3102cf7986d14a0 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Sat Mar 21 13:25:25 UTC 2026 On branch cf/5318 nothing to commit, working tree clean === using 'git am' to apply patch ./v6-0001-Add-infrastructure-for-pg_system_versions-view.patch === Applying: Add infrastructure for pg_system_versions view Using index info to reconstruct a base tree... M doc/src/sgml/system-views.sgml M src/backend/catalog/system_views.sql M src/backend/utils/misc/meson.build M src/include/catalog/pg_proc.dat M src/test/regress/expected/rules.out M src/tools/pgindent/typedefs.list Falling back to patching base and 3-way merge... Auto-merging src/tools/pgindent/typedefs.list Auto-merging src/test/regress/expected/rules.out Auto-merging src/include/catalog/pg_proc.dat Auto-merging src/backend/utils/misc/meson.build Auto-merging src/backend/catalog/system_views.sql CONFLICT (content): Merge conflict in src/backend/catalog/system_views.sql Auto-merging doc/src/sgml/system-views.sgml 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 infrastructure for pg_system_versions view 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 doc/src/sgml/system-views.sgml M src/backend/catalog/system_views.sql M src/backend/utils/misc/Makefile M src/backend/utils/misc/meson.build M src/include/catalog/pg_proc.dat M src/test/regress/expected/rules.out M src/tools/pgindent/typedefs.list Removing src/backend/utils/misc/system_version.c Removing src/include/utils/system_version.h === using patch(1) to apply patch ./v6-0001-Add-infrastructure-for-pg_system_versions-view.patch === patching file doc/src/sgml/system-views.sgml Hunk #2 succeeded at 5162 (offset 171 lines). patching file src/backend/catalog/system_views.sql Hunk #1 FAILED at 1438. 1 out of 1 hunk FAILED -- saving rejects to file src/backend/catalog/system_views.sql.rej patching file src/backend/utils/misc/Makefile patching file src/backend/utils/misc/meson.build patching file src/backend/utils/misc/system_version.c patching file src/include/catalog/pg_proc.dat Hunk #1 succeeded at 12843 with fuzz 2 (offset 239 lines). patching file src/include/utils/system_version.h patching file src/test/regress/expected/rules.out Hunk #1 succeeded at 2768 (offset 85 lines). patching file src/tools/pgindent/typedefs.list Hunk #1 succeeded at 3018 (offset 84 lines). Hunk #2 succeeded at 4348 with fuzz 1 (offset 132 lines). Unstaged changes after reset: M doc/src/sgml/system-views.sgml M src/backend/utils/misc/Makefile M src/backend/utils/misc/meson.build M src/include/catalog/pg_proc.dat M src/test/regress/expected/rules.out M src/tools/pgindent/typedefs.list Removing src/backend/catalog/system_views.sql.rej Removing src/backend/utils/misc/system_version.c Removing src/include/utils/system_version.h === using 'git apply' to apply patch ./v6-0001-Add-infrastructure-for-pg_system_versions-view.patch === Applied patch to 'doc/src/sgml/system-views.sgml' cleanly. Applied patch to 'src/backend/catalog/system_views.sql' with conflicts. Applied patch to 'src/backend/utils/misc/Makefile' cleanly. Applied patch to 'src/backend/utils/misc/meson.build' cleanly. Falling back to direct application... Applied patch to 'src/include/catalog/pg_proc.dat' cleanly. Falling back to direct application... Applied patch to 'src/test/regress/expected/rules.out' cleanly. Applied patch to 'src/tools/pgindent/typedefs.list' cleanly. U src/backend/catalog/system_views.sql diff --cc src/backend/catalog/system_views.sql index f1ed7b58f13,a00777e4f8b..00000000000 --- a/src/backend/catalog/system_views.sql +++ b/src/backend/catalog/system_views.sql @@@ -1507,3 -1436,13 +1507,16 @@@ CREATE VIEW pg_aios A SELECT * FROM pg_get_aios(); REVOKE ALL ON pg_aios FROM PUBLIC; GRANT SELECT ON pg_aios TO pg_read_all_stats; ++<<<<<<< ours ++======= + REVOKE EXECUTE ON FUNCTION pg_get_aios() FROM PUBLIC; + GRANT EXECUTE ON FUNCTION pg_get_aios() TO pg_read_all_stats; + + CREATE VIEW pg_system_versions AS + SELECT + name, version, + CASE type WHEN 0 THEN 'Compile Time' + WHEN 1 THEN 'Run Time' + END AS "type" + FROM pg_get_system_versions(); ++>>>>>>> theirs