=== Applying patches on top of PostgreSQL commit ID bdaad789c843f57b1fc66c5ede7abaff8a915c3b === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Wed Aug 12 23:54:29 UTC 2026 On branch cf/6918 nothing to commit, working tree clean === using 'git am' to apply patch ./v9-0001-Save-temporary-table-ON-COMMIT-actions-to-pg_clas.patch === Applying: Save temporary table ON COMMIT actions to pg_class. === using 'git am' to apply patch ./v9-0002-Basic-support-for-global-temporary-tables.patch === Applying: Basic support for global temporary tables. error: sha1 information is lacking or useless (src/backend/catalog/heap.c). error: could not build fake ancestor hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 Basic support for global temporary tables. 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 ./v9-0002-Basic-support-for-global-temporary-tables.patch === patching file contrib/pg_prewarm/pg_prewarm.c patching file src/backend/access/heap/heapam_handler.c patching file src/backend/access/transam/xact.c patching file src/backend/catalog/Makefile patching file src/backend/catalog/catalog.c patching file src/backend/catalog/global_temp.c patching file src/backend/catalog/heap.c patching file src/backend/catalog/information_schema.sql patching file src/backend/catalog/meson.build patching file src/backend/catalog/namespace.c patching file src/backend/catalog/pg_publication.c Hunk #1 succeeded at 101 (offset 1 line). patching file src/backend/catalog/storage.c patching file src/backend/commands/dbcommands.c Hunk #1 succeeded at 411 (offset 1 line). Hunk #2 succeeded at 447 (offset 1 line). patching file src/backend/commands/lockcmds.c patching file src/backend/commands/propgraphcmds.c Hunk #1 succeeded at 119 (offset 2 lines). patching file src/backend/commands/repack.c Hunk #2 succeeded at 1637 (offset -50 lines). patching file src/backend/commands/tablecmds.c Hunk #3 succeeded at 853 (offset 1 line). Hunk #4 succeeded at 1729 (offset 9 lines). Hunk #5 succeeded at 2798 (offset 9 lines). Hunk #6 succeeded at 3881 (offset 9 lines). Hunk #7 succeeded at 6067 (offset 9 lines). Hunk #8 succeeded at 6175 (offset 9 lines). Hunk #9 succeeded at 6752 (offset 9 lines). Hunk #10 succeeded at 10351 (offset 10 lines). Hunk #11 succeeded at 17954 (offset 31 lines). Hunk #12 succeeded at 19643 (offset 58 lines). Hunk #13 succeeded at 21271 (offset 58 lines). Hunk #14 succeeded at 23361 (offset 58 lines). patching file src/backend/commands/tablespace.c patching file src/backend/commands/view.c patching file src/backend/optimizer/path/allpaths.c patching file src/backend/parser/gram.y Hunk #1 succeeded at 3923 (offset -1 lines). Hunk #2 succeeded at 13970 (offset -3 lines). patching file src/backend/postmaster/autovacuum.c patching file src/backend/postmaster/datachecksum_state.c Hunk #2 succeeded at 1601 (offset 61 lines). Hunk #3 succeeded at 1629 (offset 61 lines). patching file src/backend/storage/buffer/bufmgr.c Hunk #7 succeeded at 1960 (offset 1 line). Hunk #8 succeeded at 1980 (offset 1 line). patching file src/backend/utils/activity/wait_event_names.txt Hunk #1 succeeded at 371 (offset 1 line). Hunk #2 succeeded at 419 (offset 1 line). patching file src/backend/utils/adt/dbsize.c patching file src/backend/utils/cache/relcache.c Hunk #2 succeeded at 1175 (offset 2 lines). Hunk #3 succeeded at 1194 (offset 2 lines). Hunk #4 succeeded at 2123 (offset 2 lines). Hunk #5 succeeded at 2150 (offset 2 lines). Hunk #6 succeeded at 2228 (offset 2 lines). Hunk #7 succeeded at 2992 (offset 2 lines). Hunk #8 succeeded at 3139 (offset 2 lines). Hunk #9 succeeded at 3698 (offset 2 lines). Hunk #10 succeeded at 3707 (offset 2 lines). Hunk #11 succeeded at 3950 (offset 2 lines). patching file src/backend/utils/cache/relfilenumbermap.c patching file src/bin/pg_amcheck/pg_amcheck.c patching file src/bin/pg_dump/pg_dump.c Hunk #2 succeeded at 7174 (offset -7 lines). Hunk #3 succeeded at 7225 (offset -7 lines). Hunk #4 succeeded at 7381 (offset -7 lines). Hunk #5 succeeded at 7460 (offset -7 lines). Hunk #6 succeeded at 17239 (offset -10 lines). Hunk #7 succeeded at 17492 (offset -10 lines). patching file src/bin/pg_dump/pg_dump.h patching file src/bin/pg_dump/t/002_pg_dump.pl patching file src/bin/pg_upgrade/info.c patching file src/bin/psql/describe.c Hunk #1 succeeded at 2027 (offset 1 line). Hunk #2 succeeded at 2081 (offset 1 line). Hunk #3 succeeded at 4206 (offset 1 line). patching file src/bin/psql/tab-complete.in.c Hunk #2 succeeded at 3852 (offset 3 lines). Hunk #3 succeeded at 3880 (offset 3 lines). patching file src/bin/scripts/vacuuming.c patching file src/include/catalog/global_temp.h patching file src/include/catalog/pg_class.h patching file src/include/catalog/storage.h patching file src/include/storage/lwlocklist.h patching file src/include/storage/subsystemlist.h patching file src/include/utils/rel.h patching file src/test/isolation/expected/global-temp.out patching file src/test/isolation/isolation_schedule Hunk #1 FAILED at 128. 1 out of 1 hunk FAILED -- saving rejects to file src/test/isolation/isolation_schedule.rej patching file src/test/isolation/specs/global-temp.spec patching file src/test/modules/test_checksums/t/010_global_temp.pl patching file src/test/regress/expected/alter_table.out patching file src/test/regress/expected/create_property_graph.out patching file src/test/regress/expected/create_table.out patching file src/test/regress/expected/create_view.out patching file src/test/regress/expected/foreign_data.out patching file src/test/regress/expected/global_temp.out patching file src/test/regress/expected/partition_merge.out patching file src/test/regress/expected/partition_split.out patching file src/test/regress/expected/type_sanity.out patching file src/test/regress/parallel_schedule patching file src/test/regress/sql/alter_table.sql Hunk #1 succeeded at 2212 (offset 2 lines). Hunk #2 succeeded at 2477 (offset 2 lines). patching file src/test/regress/sql/create_property_graph.sql patching file src/test/regress/sql/create_table.sql patching file src/test/regress/sql/global_temp.sql patching file src/test/regress/sql/type_sanity.sql patching file src/tools/pgindent/typedefs.list Unstaged changes after reset: M contrib/pg_prewarm/pg_prewarm.c M src/backend/access/heap/heapam_handler.c M src/backend/access/transam/xact.c M src/backend/catalog/Makefile M src/backend/catalog/catalog.c M src/backend/catalog/heap.c M src/backend/catalog/information_schema.sql M src/backend/catalog/meson.build M src/backend/catalog/namespace.c M src/backend/catalog/pg_publication.c M src/backend/catalog/storage.c M src/backend/commands/dbcommands.c M src/backend/commands/lockcmds.c M src/backend/commands/propgraphcmds.c M src/backend/commands/repack.c M src/backend/commands/tablecmds.c M src/backend/commands/tablespace.c M src/backend/commands/view.c M src/backend/optimizer/path/allpaths.c M src/backend/parser/gram.y M src/backend/postmaster/autovacuum.c M src/backend/postmaster/datachecksum_state.c M src/backend/storage/buffer/bufmgr.c M src/backend/utils/activity/wait_event_names.txt M src/backend/utils/adt/dbsize.c M src/backend/utils/cache/relcache.c M src/backend/utils/cache/relfilenumbermap.c M src/bin/pg_amcheck/pg_amcheck.c M src/bin/pg_dump/pg_dump.c M src/bin/pg_dump/pg_dump.h M src/bin/pg_dump/t/002_pg_dump.pl M src/bin/pg_upgrade/info.c M src/bin/psql/describe.c M src/bin/psql/tab-complete.in.c M src/bin/scripts/vacuuming.c M src/include/catalog/pg_class.h M src/include/catalog/storage.h M src/include/storage/lwlocklist.h M src/include/storage/subsystemlist.h M src/include/utils/rel.h M src/test/regress/expected/alter_table.out M src/test/regress/expected/create_property_graph.out M src/test/regress/expected/create_table.out M src/test/regress/expected/create_view.out M src/test/regress/expected/foreign_data.out M src/test/regress/expected/partition_merge.out M src/test/regress/expected/partition_split.out M src/test/regress/expected/type_sanity.out M src/test/regress/parallel_schedule M src/test/regress/sql/alter_table.sql M src/test/regress/sql/create_property_graph.sql M src/test/regress/sql/create_table.sql M src/test/regress/sql/type_sanity.sql M src/tools/pgindent/typedefs.list Removing src/backend/catalog/global_temp.c Removing src/include/catalog/global_temp.h Removing src/test/isolation/expected/global-temp.out Removing src/test/isolation/isolation_schedule.rej Removing src/test/isolation/specs/global-temp.spec Removing src/test/modules/test_checksums/t/010_global_temp.pl Removing src/test/regress/expected/global_temp.out Removing src/test/regress/sql/global_temp.sql === using 'git apply' to apply patch ./v9-0002-Basic-support-for-global-temporary-tables.patch === Applied patch to 'contrib/pg_prewarm/pg_prewarm.c' cleanly. Applied patch to 'src/backend/access/heap/heapam_handler.c' cleanly. Applied patch to 'src/backend/access/transam/xact.c' cleanly. Applied patch to 'src/backend/catalog/Makefile' cleanly. Applied patch to 'src/backend/catalog/catalog.c' cleanly. Falling back to direct application... error: repository lacks the necessary blob to perform 3-way merge. Falling back to direct application... Applied patch to 'src/backend/catalog/information_schema.sql' cleanly. Applied patch to 'src/backend/catalog/meson.build' cleanly. Applied patch to 'src/backend/catalog/namespace.c' cleanly. Applied patch to 'src/backend/catalog/pg_publication.c' cleanly. Applied patch to 'src/backend/catalog/storage.c' cleanly. Applied patch to 'src/backend/commands/dbcommands.c' cleanly. Applied patch to 'src/backend/commands/lockcmds.c' cleanly. Applied patch to 'src/backend/commands/propgraphcmds.c' cleanly. Applied patch to 'src/backend/commands/repack.c' cleanly. Applied patch to 'src/backend/commands/tablecmds.c' cleanly. Applied patch to 'src/backend/commands/tablespace.c' cleanly. Applied patch to 'src/backend/commands/view.c' cleanly. Applied patch to 'src/backend/optimizer/path/allpaths.c' cleanly. Applied patch to 'src/backend/parser/gram.y' cleanly. Applied patch to 'src/backend/postmaster/autovacuum.c' cleanly. Applied patch to 'src/backend/postmaster/datachecksum_state.c' cleanly. Applied patch to 'src/backend/storage/buffer/bufmgr.c' cleanly. Applied patch to 'src/backend/utils/activity/wait_event_names.txt' cleanly. Applied patch to 'src/backend/utils/adt/dbsize.c' cleanly. error: repository lacks the necessary blob to perform 3-way merge. Falling back to direct application... Applied patch to 'src/backend/utils/cache/relfilenumbermap.c' cleanly. Applied patch to 'src/bin/pg_amcheck/pg_amcheck.c' cleanly. Applied patch to 'src/bin/pg_dump/pg_dump.c' cleanly. Applied patch to 'src/bin/pg_dump/pg_dump.h' cleanly. Applied patch to 'src/bin/pg_dump/t/002_pg_dump.pl' cleanly. Applied patch to 'src/bin/pg_upgrade/info.c' cleanly. error: repository lacks the necessary blob to perform 3-way merge. Falling back to direct application... Applied patch to 'src/bin/psql/tab-complete.in.c' cleanly. Applied patch to 'src/bin/scripts/vacuuming.c' cleanly. Falling back to direct application... Applied patch to 'src/include/catalog/pg_class.h' cleanly. Applied patch to 'src/include/catalog/storage.h' cleanly. Applied patch to 'src/include/storage/lwlocklist.h' cleanly. Applied patch to 'src/include/storage/subsystemlist.h' cleanly. Applied patch to 'src/include/utils/rel.h' cleanly. Falling back to direct application... Applied patch to 'src/test/isolation/isolation_schedule' with conflicts. Falling back to direct application... Falling back to direct application... Applied patch to 'src/test/regress/expected/alter_table.out' cleanly. Applied patch to 'src/test/regress/expected/create_property_graph.out' cleanly. Applied patch to 'src/test/regress/expected/create_table.out' cleanly. Applied patch to 'src/test/regress/expected/create_view.out' cleanly. Applied patch to 'src/test/regress/expected/foreign_data.out' cleanly. Falling back to direct application... Applied patch to 'src/test/regress/expected/partition_merge.out' cleanly. Applied patch to 'src/test/regress/expected/partition_split.out' cleanly. Applied patch to 'src/test/regress/expected/type_sanity.out' cleanly. Applied patch to 'src/test/regress/parallel_schedule' cleanly. Applied patch to 'src/test/regress/sql/alter_table.sql' cleanly. Applied patch to 'src/test/regress/sql/create_property_graph.sql' cleanly. Applied patch to 'src/test/regress/sql/create_table.sql' cleanly. Falling back to direct application... Applied patch to 'src/test/regress/sql/type_sanity.sql' cleanly. Applied patch to 'src/tools/pgindent/typedefs.list' cleanly. U src/test/isolation/isolation_schedule diff --cc src/test/isolation/isolation_schedule index a27480a86a2,7d1aacec267..00000000000 --- a/src/test/isolation/isolation_schedule +++ b/src/test/isolation/isolation_schedule @@@ -129,5 -128,4 +129,9 @@@ test: matview-write-ske test: lock-nowait test: for-portion-of test: ddl-dependency-locking ++<<<<<<< ours +test: pub-concurrent-drop +test: drop-owned-grant ++======= + test: global-temp ++>>>>>>> theirs