=== Applying patches on top of PostgreSQL commit ID 720c9b504ec6934e93d7304e789c445dc1c09f31 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Wed Mar 18 10:32:30 UTC 2026
On branch cf/4942
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v19-0001-Avoid-orphaned-objects-dependencies.patch ===
Applying: Avoid orphaned objects dependencies
Using index info to reconstruct a base tree...
M	src/backend/catalog/aclchk.c
M	src/backend/catalog/dependency.c
M	src/backend/catalog/heap.c
M	src/backend/catalog/index.c
M	src/backend/catalog/objectaddress.c
M	src/backend/catalog/pg_aggregate.c
M	src/backend/catalog/pg_attrdef.c
M	src/backend/catalog/pg_cast.c
M	src/backend/catalog/pg_collation.c
M	src/backend/catalog/pg_constraint.c
M	src/backend/catalog/pg_conversion.c
M	src/backend/catalog/pg_depend.c
M	src/backend/catalog/pg_operator.c
M	src/backend/catalog/pg_proc.c
M	src/backend/catalog/pg_publication.c
M	src/backend/catalog/pg_range.c
M	src/backend/catalog/pg_type.c
M	src/backend/catalog/toasting.c
M	src/backend/commands/alter.c
M	src/backend/commands/amcmds.c
M	src/backend/commands/cluster.c
M	src/backend/commands/event_trigger.c
M	src/backend/commands/extension.c
M	src/backend/commands/foreigncmds.c
M	src/backend/commands/functioncmds.c
M	src/backend/commands/indexcmds.c
M	src/backend/commands/opclasscmds.c
M	src/backend/commands/operatorcmds.c
M	src/backend/commands/policy.c
M	src/backend/commands/proclang.c
M	src/backend/commands/sequence.c
M	src/backend/commands/statscmds.c
M	src/backend/commands/tablecmds.c
M	src/backend/commands/trigger.c
M	src/backend/commands/tsearchcmds.c
M	src/backend/commands/typecmds.c
M	src/backend/rewrite/rewriteDefine.c
M	src/backend/utils/errcodes.txt
M	src/include/catalog/dependency.h
M	src/include/catalog/objectaddress.h
M	src/test/isolation/isolation_schedule
M	src/test/regress/expected/alter_table.out
Falling back to patching base and 3-way merge...
Auto-merging src/test/regress/expected/alter_table.out
Auto-merging src/test/isolation/isolation_schedule
Auto-merging src/include/catalog/objectaddress.h
Auto-merging src/include/catalog/dependency.h
Auto-merging src/backend/utils/errcodes.txt
Auto-merging src/backend/rewrite/rewriteDefine.c
Auto-merging src/backend/commands/typecmds.c
Auto-merging src/backend/commands/tsearchcmds.c
Auto-merging src/backend/commands/trigger.c
Auto-merging src/backend/commands/tablecmds.c
Auto-merging src/backend/commands/statscmds.c
Auto-merging src/backend/commands/sequence.c
Auto-merging src/backend/commands/proclang.c
Auto-merging src/backend/commands/policy.c
Auto-merging src/backend/commands/operatorcmds.c
Auto-merging src/backend/commands/opclasscmds.c
Auto-merging src/backend/commands/indexcmds.c
Auto-merging src/backend/commands/functioncmds.c
Auto-merging src/backend/commands/foreigncmds.c
Auto-merging src/backend/commands/extension.c
Auto-merging src/backend/commands/event_trigger.c
Auto-merging src/backend/commands/cluster.c
Auto-merging src/backend/commands/amcmds.c
Auto-merging src/backend/commands/alter.c
Auto-merging src/backend/catalog/toasting.c
Auto-merging src/backend/catalog/pg_type.c
Auto-merging src/backend/catalog/pg_range.c
Auto-merging src/backend/catalog/pg_publication.c
Auto-merging src/backend/catalog/pg_proc.c
CONFLICT (content): Merge conflict in src/backend/catalog/pg_proc.c
Auto-merging src/backend/catalog/pg_operator.c
Auto-merging src/backend/catalog/pg_depend.c
Auto-merging src/backend/catalog/pg_conversion.c
Auto-merging src/backend/catalog/pg_constraint.c
Auto-merging src/backend/catalog/pg_collation.c
Auto-merging src/backend/catalog/pg_cast.c
Auto-merging src/backend/catalog/pg_attrdef.c
Auto-merging src/backend/catalog/pg_aggregate.c
Auto-merging src/backend/catalog/objectaddress.c
Auto-merging src/backend/catalog/index.c
Auto-merging src/backend/catalog/heap.c
Auto-merging src/backend/catalog/dependency.c
CONFLICT (content): Merge conflict in src/backend/catalog/dependency.c
Auto-merging src/backend/catalog/aclchk.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 Avoid orphaned objects dependencies
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/catalog/aclchk.c
M	src/backend/catalog/dependency.c
M	src/backend/catalog/heap.c
M	src/backend/catalog/index.c
M	src/backend/catalog/objectaddress.c
M	src/backend/catalog/pg_aggregate.c
M	src/backend/catalog/pg_attrdef.c
M	src/backend/catalog/pg_cast.c
M	src/backend/catalog/pg_collation.c
M	src/backend/catalog/pg_constraint.c
M	src/backend/catalog/pg_conversion.c
M	src/backend/catalog/pg_depend.c
M	src/backend/catalog/pg_operator.c
M	src/backend/catalog/pg_proc.c
M	src/backend/catalog/pg_publication.c
M	src/backend/catalog/pg_range.c
M	src/backend/catalog/pg_type.c
M	src/backend/catalog/toasting.c
M	src/backend/commands/alter.c
M	src/backend/commands/amcmds.c
M	src/backend/commands/cluster.c
M	src/backend/commands/event_trigger.c
M	src/backend/commands/extension.c
M	src/backend/commands/foreigncmds.c
M	src/backend/commands/functioncmds.c
M	src/backend/commands/indexcmds.c
M	src/backend/commands/opclasscmds.c
M	src/backend/commands/operatorcmds.c
M	src/backend/commands/policy.c
M	src/backend/commands/proclang.c
M	src/backend/commands/sequence.c
M	src/backend/commands/statscmds.c
M	src/backend/commands/tablecmds.c
M	src/backend/commands/trigger.c
M	src/backend/commands/tsearchcmds.c
M	src/backend/commands/typecmds.c
M	src/backend/rewrite/rewriteDefine.c
M	src/backend/utils/errcodes.txt
M	src/include/catalog/dependency.h
M	src/include/catalog/objectaddress.h
M	src/test/isolation/isolation_schedule
M	src/test/regress/expected/alter_table.out
Removing src/test/isolation/expected/test_dependencies_locks.out
Removing src/test/isolation/specs/test_dependencies_locks.spec
=== using patch(1) to apply patch ./v19-0001-Avoid-orphaned-objects-dependencies.patch ===
patching file src/backend/catalog/aclchk.c
Hunk #1 succeeded at 1387 (offset 46 lines).
patching file src/backend/catalog/dependency.c
Hunk #1 succeeded at 1590 (offset 71 lines).
Hunk #2 succeeded at 1896 (offset 103 lines).
Hunk #3 succeeded at 1923 (offset 103 lines).
Hunk #4 succeeded at 1935 (offset 103 lines).
Hunk #5 succeeded at 1956 (offset 103 lines).
Hunk #6 succeeded at 2065 (offset 114 lines).
Hunk #7 succeeded at 2090 (offset 114 lines).
Hunk #8 succeeded at 2099 (offset 114 lines).
Hunk #9 succeeded at 2108 (offset 114 lines).
Hunk #10 succeeded at 2117 (offset 114 lines).
Hunk #11 succeeded at 2126 (offset 114 lines).
Hunk #12 succeeded at 2135 (offset 114 lines).
Hunk #13 succeeded at 2152 (offset 114 lines).
Hunk #14 succeeded at 2180 (offset 114 lines).
Hunk #15 succeeded at 2209 (offset 114 lines).
Hunk #16 succeeded at 2286 (offset 114 lines).
Hunk #17 succeeded at 2294 (offset 114 lines).
Hunk #18 succeeded at 2302 (offset 114 lines).
Hunk #19 succeeded at 2313 (offset 114 lines).
Hunk #20 succeeded at 2329 (offset 114 lines).
Hunk #21 succeeded at 2337 (offset 114 lines).
Hunk #22 succeeded at 2346 (offset 114 lines).
Hunk #23 succeeded at 2373 (offset 114 lines).
Hunk #24 succeeded at 2398 (offset 114 lines).
Hunk #25 FAILED at 2333.
Hunk #26 succeeded at 2515 (offset 115 lines).
Hunk #27 succeeded at 2539 (offset 115 lines).
Hunk #28 succeeded at 2574 (offset 115 lines).
Hunk #29 succeeded at 2605 (offset 115 lines).
Hunk #30 succeeded at 2681 (offset 115 lines).
1 out of 30 hunks FAILED -- saving rejects to file src/backend/catalog/dependency.c.rej
patching file src/backend/catalog/heap.c
Hunk #1 succeeded at 858 (offset 21 lines).
Hunk #2 succeeded at 867 (offset 21 lines).
Hunk #3 succeeded at 1478 (offset 24 lines).
Hunk #4 succeeded at 1500 (offset 24 lines).
Hunk #5 succeeded at 3968 (offset 164 lines).
Hunk #6 succeeded at 3976 (offset 164 lines).
patching file src/backend/catalog/index.c
Hunk #1 succeeded at 1119 (offset 2 lines).
Hunk #2 succeeded at 1132 (offset 2 lines).
Hunk #3 succeeded at 1153 (offset 2 lines).
Hunk #4 succeeded at 1170 (offset 2 lines).
Hunk #5 succeeded at 1192 (offset 2 lines).
Hunk #6 succeeded at 1201 (offset 2 lines).
Hunk #7 succeeded at 2012 (offset 2 lines).
Hunk #8 succeeded at 2031 (offset 2 lines).
patching file src/backend/catalog/objectaddress.c
Hunk #1 succeeded at 2696 (offset 101 lines).
patching file src/backend/catalog/pg_aggregate.c
Hunk #1 succeeded at 749 (offset 1 line).
Hunk #2 succeeded at 764 (offset 1 line).
Hunk #3 succeeded at 772 (offset 1 line).
Hunk #4 succeeded at 780 (offset 1 line).
Hunk #5 succeeded at 788 (offset 1 line).
Hunk #6 succeeded at 796 (offset 1 line).
Hunk #7 succeeded at 804 (offset 1 line).
Hunk #8 succeeded at 812 (offset 1 line).
patching file src/backend/catalog/pg_attrdef.c
Hunk #1 succeeded at 119 (offset -59 lines).
patching file src/backend/catalog/pg_cast.c
patching file src/backend/catalog/pg_collation.c
patching file src/backend/catalog/pg_constraint.c
Hunk #1 succeeded at 266 (offset 2 lines).
Hunk #2 succeeded at 298 (offset 2 lines).
Hunk #3 succeeded at 318 (offset 2 lines).
Hunk #4 succeeded at 353 (offset 2 lines).
Hunk #5 succeeded at 373 (offset 2 lines).
Hunk #6 succeeded at 1185 (offset 43 lines).
patching file src/backend/catalog/pg_conversion.c
patching file src/backend/catalog/pg_depend.c
Hunk #1 FAILED at 20.
Hunk #2 succeeded at 101 (offset 2 lines).
Hunk #3 succeeded at 271 (offset 2 lines).
Hunk #4 succeeded at 739 (offset 2 lines).
1 out of 4 hunks FAILED -- saving rejects to file src/backend/catalog/pg_depend.c.rej
patching file src/backend/catalog/pg_operator.c
patching file src/backend/catalog/pg_proc.c
Hunk #1 succeeded at 623 (offset 30 lines).
Hunk #2 FAILED at 607.
Hunk #3 FAILED at 628.
Hunk #4 succeeded at 665 with fuzz 1 (offset 23 lines).
Hunk #5 succeeded at 728 (offset 46 lines).
2 out of 5 hunks FAILED -- saving rejects to file src/backend/catalog/pg_proc.c.rej
patching file src/backend/catalog/pg_publication.c
Hunk #1 succeeded at 455 (offset 14 lines).
Hunk #2 succeeded at 520 (offset 16 lines).
Hunk #3 succeeded at 540 (offset 16 lines).
Hunk #4 succeeded at 759 (offset 33 lines).
patching file src/backend/catalog/pg_range.c
Hunk #1 succeeded at 77 (offset 7 lines).
Hunk #2 succeeded at 111 (offset 7 lines).
patching file src/backend/catalog/pg_type.c
Hunk #3 succeeded at 499 (offset -2 lines).
Hunk #4 succeeded at 541 (offset -2 lines).
patching file src/backend/catalog/toasting.c
Hunk #1 succeeded at 389 (offset 6 lines).
patching file src/backend/commands/alter.c
Hunk #1 succeeded at 510 (offset 11 lines).
Hunk #2 succeeded at 818 (offset 12 lines).
patching file src/backend/commands/amcmds.c
patching file src/backend/commands/cluster.c
Hunk #1 succeeded at 1289 (offset 15 lines).
Hunk #2 succeeded at 1298 (offset 15 lines).
Hunk #3 succeeded at 1401 (offset 15 lines).
Hunk #4 succeeded at 1411 (offset 15 lines).
patching file src/backend/commands/event_trigger.c
Hunk #1 succeeded at 332 (offset 5 lines).
patching file src/backend/commands/extension.c
Hunk #1 succeeded at 2300 (offset 265 lines).
Hunk #2 succeeded at 2309 (offset 265 lines).
Hunk #3 succeeded at 3451 (offset 370 lines).
Hunk #4 succeeded at 3742 (offset 370 lines).
Hunk #5 succeeded at 3899 (offset 370 lines).
patching file src/backend/commands/foreigncmds.c
Hunk #1 succeeded at 696 (offset 54 lines).
Hunk #2 succeeded at 705 (offset 54 lines).
Hunk #3 succeeded at 876 (offset 63 lines).
Hunk #4 succeeded at 885 (offset 63 lines).
Hunk #5 succeeded at 1018 (offset 63 lines).
Hunk #6 succeeded at 1263 (offset 63 lines).
Hunk #7 succeeded at 1541 (offset 63 lines).
patching file src/backend/commands/functioncmds.c
Hunk #1 succeeded at 1467 (offset 6 lines).
Hunk #2 succeeded at 1481 (offset 6 lines).
Hunk #3 succeeded at 1998 (offset 6 lines).
patching file src/backend/commands/indexcmds.c
Hunk #1 succeeded at 4575 (offset 87 lines).
patching file src/backend/commands/opclasscmds.c
Hunk #2 succeeded at 748 (offset 20 lines).
Hunk #3 succeeded at 771 (offset 20 lines).
Hunk #4 succeeded at 1536 (offset 43 lines).
Hunk #5 succeeded at 1553 (offset 43 lines).
Hunk #6 succeeded at 1562 (offset 43 lines).
Hunk #7 succeeded at 1596 (offset 43 lines).
Hunk #8 succeeded at 1680 (offset 43 lines).
Hunk #9 succeeded at 1689 (offset 43 lines).
patching file src/backend/commands/operatorcmds.c
Hunk #2 succeeded at 690 (offset 33 lines).
Hunk #3 succeeded at 726 (offset 33 lines).
patching file src/backend/commands/policy.c
patching file src/backend/commands/proclang.c
Hunk #1 succeeded at 191 (offset 1 line).
Hunk #2 succeeded at 206 (offset 1 line).
patching file src/backend/commands/sequence.c
Hunk #1 succeeded at 1696 (offset 5 lines).
patching file src/backend/commands/statscmds.c
Hunk #1 succeeded at 89 (offset 1 line).
Hunk #2 succeeded at 577 (offset 40 lines).
Hunk #3 succeeded at 600 (offset 40 lines).
Hunk #4 succeeded at 622 (offset 40 lines).
patching file src/backend/commands/tablecmds.c
Hunk #1 succeeded at 3613 (offset 86 lines).
Hunk #2 succeeded at 7670 (offset 235 lines).
Hunk #3 succeeded at 10927 (offset 433 lines).
Hunk #4 succeeded at 15224 (offset 1247 lines).
Hunk #5 succeeded at 16828 (offset 1271 lines).
Hunk #6 succeeded at 16848 (offset 1271 lines).
Hunk #7 succeeded at 18574 (offset 1274 lines).
Hunk #8 succeeded at 19347 (offset 1274 lines).
patching file src/backend/commands/trigger.c
Hunk #1 succeeded at 1025 (offset 5 lines).
Hunk #2 succeeded at 1032 (offset 5 lines).
Hunk #3 succeeded at 1057 (offset 5 lines).
Hunk #4 succeeded at 1071 (offset 5 lines).
Hunk #5 succeeded at 1084 (offset 5 lines).
Hunk #6 succeeded at 1093 (offset 5 lines).
Hunk #7 succeeded at 1109 (offset 5 lines).
Hunk #8 succeeded at 1119 (offset 5 lines).
Hunk #9 succeeded at 1132 (offset 5 lines).
Hunk #10 succeeded at 1284 (offset 5 lines).
patching file src/backend/commands/tsearchcmds.c
Hunk #7 succeeded at 1101 with fuzz 2.
patching file src/backend/commands/typecmds.c
Hunk #1 succeeded at 1847 with fuzz 2 (offset 27 lines).
Hunk #2 succeeded at 1919 with fuzz 2 (offset 33 lines).
Hunk #3 succeeded at 2737 (offset 37 lines).
Hunk #4 succeeded at 4358 (offset 54 lines).
Hunk #5 succeeded at 4656 (offset 54 lines).
Hunk #6 succeeded at 4705 (offset 54 lines).
patching file src/backend/rewrite/rewriteDefine.c
patching file src/backend/utils/errcodes.txt
patching file src/include/catalog/dependency.h
Hunk #2 succeeded at 185 (offset 11 lines).
patching file src/include/catalog/objectaddress.h
Hunk #1 succeeded at 54 (offset 1 line).
patching file src/test/isolation/expected/test_dependencies_locks.out
patching file src/test/isolation/isolation_schedule
Hunk #1 succeeded at 124 (offset 9 lines).
patching file src/test/isolation/specs/test_dependencies_locks.spec
patching file src/test/regress/expected/alter_table.out
Hunk #1 succeeded at 2938 (offset 76 lines).
Unstaged changes after reset:
M	src/backend/catalog/aclchk.c
M	src/backend/catalog/dependency.c
M	src/backend/catalog/heap.c
M	src/backend/catalog/index.c
M	src/backend/catalog/objectaddress.c
M	src/backend/catalog/pg_aggregate.c
M	src/backend/catalog/pg_attrdef.c
M	src/backend/catalog/pg_cast.c
M	src/backend/catalog/pg_collation.c
M	src/backend/catalog/pg_constraint.c
M	src/backend/catalog/pg_conversion.c
M	src/backend/catalog/pg_depend.c
M	src/backend/catalog/pg_operator.c
M	src/backend/catalog/pg_proc.c
M	src/backend/catalog/pg_publication.c
M	src/backend/catalog/pg_range.c
M	src/backend/catalog/pg_type.c
M	src/backend/catalog/toasting.c
M	src/backend/commands/alter.c
M	src/backend/commands/amcmds.c
M	src/backend/commands/cluster.c
M	src/backend/commands/event_trigger.c
M	src/backend/commands/extension.c
M	src/backend/commands/foreigncmds.c
M	src/backend/commands/functioncmds.c
M	src/backend/commands/indexcmds.c
M	src/backend/commands/opclasscmds.c
M	src/backend/commands/operatorcmds.c
M	src/backend/commands/policy.c
M	src/backend/commands/proclang.c
M	src/backend/commands/sequence.c
M	src/backend/commands/statscmds.c
M	src/backend/commands/tablecmds.c
M	src/backend/commands/trigger.c
M	src/backend/commands/tsearchcmds.c
M	src/backend/commands/typecmds.c
M	src/backend/rewrite/rewriteDefine.c
M	src/backend/utils/errcodes.txt
M	src/include/catalog/dependency.h
M	src/include/catalog/objectaddress.h
M	src/test/isolation/isolation_schedule
M	src/test/regress/expected/alter_table.out
Removing src/backend/catalog/dependency.c.rej
Removing src/backend/catalog/pg_depend.c.rej
Removing src/backend/catalog/pg_proc.c.rej
Removing src/test/isolation/expected/test_dependencies_locks.out
Removing src/test/isolation/specs/test_dependencies_locks.spec
=== using 'git apply' to apply patch ./v19-0001-Avoid-orphaned-objects-dependencies.patch ===
Applied patch to 'src/backend/catalog/aclchk.c' cleanly.
Applied patch to 'src/backend/catalog/dependency.c' with conflicts.
Applied patch to 'src/backend/catalog/heap.c' cleanly.
Applied patch to 'src/backend/catalog/index.c' cleanly.
Applied patch to 'src/backend/catalog/objectaddress.c' cleanly.
Applied patch to 'src/backend/catalog/pg_aggregate.c' cleanly.
Applied patch to 'src/backend/catalog/pg_attrdef.c' cleanly.
Applied patch to 'src/backend/catalog/pg_cast.c' cleanly.
Applied patch to 'src/backend/catalog/pg_collation.c' cleanly.
Applied patch to 'src/backend/catalog/pg_constraint.c' cleanly.
Applied patch to 'src/backend/catalog/pg_conversion.c' cleanly.
Applied patch to 'src/backend/catalog/pg_depend.c' cleanly.
Applied patch to 'src/backend/catalog/pg_operator.c' cleanly.
Applied patch to 'src/backend/catalog/pg_proc.c' with conflicts.
Applied patch to 'src/backend/catalog/pg_publication.c' cleanly.
Applied patch to 'src/backend/catalog/pg_range.c' cleanly.
Applied patch to 'src/backend/catalog/pg_type.c' cleanly.
Applied patch to 'src/backend/catalog/toasting.c' cleanly.
Applied patch to 'src/backend/commands/alter.c' cleanly.
Applied patch to 'src/backend/commands/amcmds.c' cleanly.
Applied patch to 'src/backend/commands/cluster.c' cleanly.
Applied patch to 'src/backend/commands/event_trigger.c' cleanly.
Applied patch to 'src/backend/commands/extension.c' cleanly.
Applied patch to 'src/backend/commands/foreigncmds.c' cleanly.
Applied patch to 'src/backend/commands/functioncmds.c' cleanly.
Applied patch to 'src/backend/commands/indexcmds.c' cleanly.
Applied patch to 'src/backend/commands/opclasscmds.c' cleanly.
Applied patch to 'src/backend/commands/operatorcmds.c' cleanly.
Applied patch to 'src/backend/commands/policy.c' cleanly.
Applied patch to 'src/backend/commands/proclang.c' cleanly.
Applied patch to 'src/backend/commands/sequence.c' cleanly.
Applied patch to 'src/backend/commands/statscmds.c' cleanly.
Applied patch to 'src/backend/commands/tablecmds.c' cleanly.
Applied patch to 'src/backend/commands/trigger.c' cleanly.
Applied patch to 'src/backend/commands/tsearchcmds.c' cleanly.
Applied patch to 'src/backend/commands/typecmds.c' cleanly.
Applied patch to 'src/backend/rewrite/rewriteDefine.c' cleanly.
Applied patch to 'src/backend/utils/errcodes.txt' cleanly.
Applied patch to 'src/include/catalog/dependency.h' cleanly.
Applied patch to 'src/include/catalog/objectaddress.h' cleanly.
Falling back to direct application...
Applied patch to 'src/test/isolation/isolation_schedule' cleanly.
Falling back to direct application...
Applied patch to 'src/test/regress/expected/alter_table.out' cleanly.
U src/backend/catalog/dependency.c
U src/backend/catalog/pg_proc.c
diff --cc src/backend/catalog/dependency.c
index fdb8e67e1f5,34884aa8950..00000000000
--- a/src/backend/catalog/dependency.c
+++ b/src/backend/catalog/dependency.c
@@@ -2277,7 -2333,7 +2447,11 @@@ find_expr_references_walker(Node *node
  			switch (rte->rtekind)
  			{
  				case RTE_RELATION:
++<<<<<<< ours
 +				case RTE_GRAPH_TABLE:
++=======
+ 					LockNotPinnedObject(RelationRelationId, rte->relid);
++>>>>>>> theirs
  					add_object_address(RelationRelationId, rte->relid, 0,
  									   context->addrs);
  					break;
diff --cc src/backend/catalog/pg_proc.c
index 5df4b3f7a91,c3999bdce87..00000000000
--- a/src/backend/catalog/pg_proc.c
+++ b/src/backend/catalog/pg_proc.c
@@@ -638,19 -617,30 +647,43 @@@ ProcedureCreate(const char *procedureNa
  	/* dependency on return type */
  	ObjectAddressSet(referenced, TypeRelationId, returnType);
  	add_exact_object_address(&referenced, addrs);
+ 	LockNotPinnedObject(TypeRelationId, returnType);
  
++<<<<<<< ours
++=======
+ 	/* dependency on transform used by return type, if any */
+ 	if ((trfid = get_transform_oid(returnType, languageObjectId, true)))
+ 	{
+ 		ObjectAddressSet(referenced, TransformRelationId, trfid);
+ 		add_exact_object_address(&referenced, addrs);
+ 		LockNotPinnedObject(TransformRelationId, trfid);
+ 	}
+ 
++>>>>>>> theirs
  	/* dependency on parameter types */
  	for (i = 0; i < allParamCount; i++)
  	{
  		ObjectAddressSet(referenced, TypeRelationId, allParams[i]);
  		add_exact_object_address(&referenced, addrs);
++<<<<<<< ours
 +	}
 +
 +	/* dependency on transforms, if any */
 +	foreach_oid(transformid, trfoids)
 +	{
 +		ObjectAddressSet(referenced, TransformRelationId, transformid);
 +		add_exact_object_address(&referenced, addrs);
++=======
+ 		LockNotPinnedObject(TypeRelationId, allParams[i]);
+ 
+ 		/* dependency on transform used by parameter type, if any */
+ 		if ((trfid = get_transform_oid(allParams[i], languageObjectId, true)))
+ 		{
+ 			ObjectAddressSet(referenced, TransformRelationId, trfid);
+ 			add_exact_object_address(&referenced, addrs);
+ 			LockNotPinnedObject(TransformRelationId, trfid);
+ 		}
++>>>>>>> theirs
  	}
  
  	/* dependency on support function, if any */
@@@ -658,11 -648,15 +691,12 @@@
  	{
  		ObjectAddressSet(referenced, ProcedureRelationId, prosupport);
  		add_exact_object_address(&referenced, addrs);
+ 		LockNotPinnedObject(ProcedureRelationId, prosupport);
  	}
  
 -	record_object_address_dependencies(&myself, addrs, DEPENDENCY_NORMAL);
 -	free_object_addresses(addrs);
 -
 -	/* dependency on SQL routine body */
 +	/* dependencies appearing in new-style SQL routine body */
  	if (languageObjectId == SQLlanguageId && prosqlbody)
 -		recordDependencyOnExpr(&myself, prosqlbody, NIL, DEPENDENCY_NORMAL);
 +		collectDependenciesOfExpr(addrs, prosqlbody, NIL);
  
  	/* dependency on parameter default expressions */
  	if (parameterDefaults)