=== Applying patches on top of PostgreSQL commit ID 1c77203c15e43d4ae9a8fed67ce89eeeca54af8f === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Mon Jun 8 23:30:27 UTC 2026 On branch cf/6733 nothing to commit, working tree clean === using 'git am' to apply patch ./0001-add-fast-parameter-to-enable-disable-checksums.patch === Applying: add fast parameter to enable/disable checksums Using index info to reconstruct a base tree... M doc/src/sgml/func/func-admin.sgml M src/backend/access/transam/xlog.c M src/backend/postmaster/datachecksum_state.c M src/include/catalog/pg_proc.dat Falling back to patching base and 3-way merge... Auto-merging src/include/catalog/pg_proc.dat CONFLICT (content): Merge conflict in src/include/catalog/pg_proc.dat Auto-merging src/backend/postmaster/datachecksum_state.c Auto-merging src/backend/access/transam/xlog.c Auto-merging doc/src/sgml/func/func-admin.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 fast parameter to enable/disable checksums 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 ./0001-add-fast-parameter-to-enable-disable-checksums.patch === patching file doc/src/sgml/func/func-admin.sgml patching file src/backend/access/transam/xlog.c Hunk #1 succeeded at 4799 (offset -4 lines). Hunk #2 succeeded at 4816 (offset -5 lines). Hunk #3 succeeded at 4846 (offset -5 lines). Hunk #4 succeeded at 4868 (offset -5 lines). Hunk #5 succeeded at 4918 (offset -5 lines). Hunk #6 succeeded at 4956 (offset -5 lines). patching file src/backend/postmaster/datachecksum_state.c Hunk #2 succeeded at 320 with fuzz 1 (offset 1 line). Hunk #3 succeeded at 508 (offset -3 lines). Hunk #4 succeeded at 517 (offset -3 lines). Hunk #5 succeeded at 531 (offset -3 lines). Hunk #6 succeeded at 550 (offset -3 lines). Hunk #7 succeeded at 570 (offset -3 lines). Hunk #8 succeeded at 591 (offset -3 lines). Hunk #9 succeeded at 950 (offset 5 lines). Hunk #10 succeeded at 1093 (offset 5 lines). Hunk #11 succeeded at 1152 (offset 5 lines). Hunk #12 succeeded at 1164 (offset 5 lines). Hunk #13 succeeded at 1192 (offset 5 lines). Hunk #14 succeeded at 1282 (offset 5 lines). Hunk #15 succeeded at 1620 (offset 5 lines). patching file src/include/access/xlog.h patching file src/include/catalog/pg_proc.dat Hunk #1 FAILED at 12457. 1 out of 1 hunk FAILED -- saving rejects to file src/include/catalog/pg_proc.dat.rej patching file src/include/postmaster/datachecksum_state.h Unstaged changes after reset: M doc/src/sgml/func/func-admin.sgml M src/backend/access/transam/xlog.c M src/backend/postmaster/datachecksum_state.c M src/include/access/xlog.h M src/include/postmaster/datachecksum_state.h Removing src/include/catalog/pg_proc.dat.rej === using 'git apply' to apply patch ./0001-add-fast-parameter-to-enable-disable-checksums.patch === Applied patch to 'doc/src/sgml/func/func-admin.sgml' cleanly. Applied patch to 'src/backend/access/transam/xlog.c' cleanly. Applied patch to 'src/backend/postmaster/datachecksum_state.c' cleanly. Applied patch to 'src/include/access/xlog.h' cleanly. Applied patch to 'src/include/catalog/pg_proc.dat' with conflicts. Applied patch to 'src/include/postmaster/datachecksum_state.h' cleanly. U src/include/catalog/pg_proc.dat diff --cc src/include/catalog/pg_proc.dat index be157a5fbe9,fed5fba4c0c..00000000000 --- a/src/include/catalog/pg_proc.dat +++ b/src/include/catalog/pg_proc.dat @@@ -12388,16 -12454,19 +12388,32 @@@ proargtypes => 'internal', prosrc => 'jsonb_subscript_handler' }, # data checksum management functions ++<<<<<<< ours +{ oid => '6507', descr => 'disable data checksums', + proname => 'pg_disable_data_checksums', provolatile => 'v', + proparallel => 'r', prorettype => 'void', proargtypes => '', + prosrc => 'disable_data_checksums', proacl => '{POSTGRES=X}' }, +{ oid => '6506', descr => 'enable data checksums', + proname => 'pg_enable_data_checksums', provolatile => 'v', proparallel => 'r', + prorettype => 'void', proargtypes => 'int4 int4', + proallargtypes => '{int4,int4}', proargmodes => '{i,i}', + proargnames => '{cost_delay,cost_limit}', proargdefaults => '{0,100}', + prosrc => 'enable_data_checksums', proacl => '{POSTGRES=X}' }, ++======= + { oid => '9258', + descr => 'disable data checksums', + proname => 'pg_disable_data_checksums', provolatile => 'v', prorettype => 'void', + proparallel => 'r', prosrc => 'disable_data_checksums', proargtypes => 'bool', + proallargtypes => '{bool}', proargmodes => '{i}', proargnames => '{fast}', + proargdefaults => '{true}', proacl => '{POSTGRES=X}'}, + { oid => '9257', + descr => 'enable data checksums', + proname => 'pg_enable_data_checksums', provolatile => 'v', prorettype => 'void', + proparallel => 'r', proargtypes => 'int4 int4 bool', proallargtypes => '{int4,int4,bool}', + proargmodes => '{i,i,i}', proargnames => '{cost_delay,cost_limit,fast}', + proargdefaults => '{0,100,true}', prosrc => 'enable_data_checksums', + proacl => '{POSTGRES=X}'}, ++>>>>>>> theirs # collation management functions { oid => '3445', descr => 'import collations from operating system',