=== Applying patches on top of PostgreSQL commit ID 1b795ef0329d64427f3e779e38c7c492c0a15e5d === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Wed Jan 7 17:28:19 UTC 2026 On branch cf/6309 nothing to commit, working tree clean === using 'git am' to apply patch ./v1-0001-Add-SQL-level-datum-equality-tests.patch === Applying: Add SQL-level datum equality tests Using index info to reconstruct a base tree... M src/backend/utils/adt/pseudotypes.c M src/include/catalog/pg_proc.dat M src/test/regress/expected/opr_sanity.out Falling back to patching base and 3-way merge... Auto-merging src/test/regress/expected/opr_sanity.out CONFLICT (content): Merge conflict in src/test/regress/expected/opr_sanity.out Auto-merging src/include/catalog/pg_proc.dat CONFLICT (content): Merge conflict in src/include/catalog/pg_proc.dat Auto-merging src/backend/utils/adt/pseudotypes.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 SQL-level datum equality tests 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/utils/adt/pseudotypes.c M src/include/catalog/pg_proc.dat M src/test/regress/expected/opr_sanity.out === using patch(1) to apply patch ./v1-0001-Add-SQL-level-datum-equality-tests.patch === patching file src/backend/utils/adt/pseudotypes.c patching file src/include/catalog/pg_proc.dat Hunk #1 succeeded at 12683 with fuzz 2 (offset 71 lines). patching file src/test/regress/expected/opr_sanity.out Hunk #1 FAILED at 880. 1 out of 1 hunk FAILED -- saving rejects to file src/test/regress/expected/opr_sanity.out.rej Unstaged changes after reset: M src/backend/utils/adt/pseudotypes.c M src/include/catalog/pg_proc.dat Removing src/test/regress/expected/opr_sanity.out.rej === using 'git apply' to apply patch ./v1-0001-Add-SQL-level-datum-equality-tests.patch === Applied patch to 'src/backend/utils/adt/pseudotypes.c' cleanly. Applied patch to 'src/include/catalog/pg_proc.dat' with conflicts. Applied patch to 'src/test/regress/expected/opr_sanity.out' with conflicts. U src/include/catalog/pg_proc.dat U src/test/regress/expected/opr_sanity.out diff --cc src/include/catalog/pg_proc.dat index 2ac69bf2df5,2f1b1ba8370..00000000000 --- a/src/include/catalog/pg_proc.dat +++ b/src/include/catalog/pg_proc.dat @@@ -12628,59 -12612,11 +12628,68 @@@ proargnames => '{pid,io_id,io_generation,state,operation,off,length,target,handle_data_len,raw_result,result,target_desc,f_sync,f_localmem,f_buffered}', prosrc => 'pg_get_aios' }, ++<<<<<<< ours +# oid8 related functions +{ oid => '8255', descr => 'convert oid to oid8', + proname => 'oid8', prorettype => 'oid8', proargtypes => 'oid', + prosrc => 'oidtooid8' }, +{ oid => '8257', descr => 'I/O', + proname => 'oid8in', prorettype => 'oid8', proargtypes => 'cstring', + prosrc => 'oid8in' }, +{ oid => '8258', descr => 'I/O', + proname => 'oid8out', prorettype => 'cstring', proargtypes => 'oid8', + prosrc => 'oid8out' }, +{ oid => '8259', descr => 'I/O', + proname => 'oid8recv', prorettype => 'oid8', proargtypes => 'internal', + prosrc => 'oid8recv' }, +{ oid => '8260', descr => 'I/O', + proname => 'oid8send', prorettype => 'bytea', proargtypes => 'oid8', + prosrc => 'oid8send' }, +# Comparators +{ oid => '8268', + proname => 'oid8eq', proleakproof => 't', prorettype => 'bool', + proargtypes => 'oid8 oid8', prosrc => 'oid8eq' }, +{ oid => '8269', + proname => 'oid8ne', proleakproof => 't', prorettype => 'bool', + proargtypes => 'oid8 oid8', prosrc => 'oid8ne' }, +{ oid => '8270', + proname => 'oid8lt', proleakproof => 't', prorettype => 'bool', + proargtypes => 'oid8 oid8', prosrc => 'oid8lt' }, +{ oid => '8271', + proname => 'oid8le', proleakproof => 't', prorettype => 'bool', + proargtypes => 'oid8 oid8', prosrc => 'oid8le' }, +{ oid => '8272', + proname => 'oid8gt', proleakproof => 't', prorettype => 'bool', + proargtypes => 'oid8 oid8', prosrc => 'oid8gt' }, +{ oid => '8273', + proname => 'oid8ge', proleakproof => 't', prorettype => 'bool', + proargtypes => 'oid8 oid8', prosrc => 'oid8ge' }, +# Aggregates +{ oid => '8274', descr => 'larger of two', + proname => 'oid8larger', prorettype => 'oid8', proargtypes => 'oid8 oid8', + prosrc => 'oid8larger' }, +{ oid => '8275', descr => 'smaller of two', + proname => 'oid8smaller', prorettype => 'oid8', proargtypes => 'oid8 oid8', + prosrc => 'oid8smaller' }, +{ oid => '8276', descr => 'maximum value of all oid8 input values', + proname => 'max', prokind => 'a', proisstrict => 'f', prorettype => 'oid8', + proargtypes => 'oid8', prosrc => 'aggregate_dummy' }, +{ oid => '8277', descr => 'minimum value of all oid8 input values', + proname => 'min', prokind => 'a', proisstrict => 'f', prorettype => 'oid8', + proargtypes => 'oid8', prosrc => 'aggregate_dummy' }, +{ oid => '8280', descr => 'hash', + proname => 'hashoid8', prorettype => 'int4', proargtypes => 'oid8', + prosrc => 'hashoid8' }, +{ oid => '8281', descr => 'hash', + proname => 'hashoid8extended', prorettype => 'int8', + proargtypes => 'oid8 int8', prosrc => 'hashoid8extended' }, ++======= + { oid => '9200', + descr => 'test if two values have the same binary representation', + proname => 'pg_datum_image_equal', proisstrict => 'f', + proleakproof => 't', prorettype => 'bool', + proargtypes => 'anyelement anyelement', + prosrc => 'pg_datum_image_equal' }, ++>>>>>>> theirs ] diff --cc src/test/regress/expected/opr_sanity.out index 6ff4d7ee901,57fe8d6ede8..00000000000 --- a/src/test/regress/expected/opr_sanity.out +++ b/src/test/regress/expected/opr_sanity.out @@@ -880,13 -880,7 +880,17 @@@ bytea(integer bytea(bigint) bytea_larger(bytea,bytea) bytea_smaller(bytea,bytea) ++<<<<<<< ours +oid8eq(oid8,oid8) +oid8ne(oid8,oid8) +oid8lt(oid8,oid8) +oid8le(oid8,oid8) +oid8gt(oid8,oid8) +oid8ge(oid8,oid8) +btoid8cmp(oid8,oid8) ++======= + pg_datum_image_equal(anyelement,anyelement) ++>>>>>>> theirs -- Check that functions without argument are not marked as leakproof. SELECT p1.oid::regprocedure FROM pg_proc p1 JOIN pg_namespace pn