=== Applying patches on top of PostgreSQL commit ID c70f6dc6bd793cca86c734865914a031ef88240f === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Wed Mar 4 19:46:26 UTC 2026 On branch cf/5323 nothing to commit, working tree clean === using 'git am' to apply patch ./v20260305-0001-Online-enabling-and-disabling-of-data-chec.patch === Applying: Online enabling and disabling of data checksums Using index info to reconstruct a base tree... M doc/src/sgml/func/func-admin.sgml M doc/src/sgml/monitoring.sgml M src/backend/access/transam/xlog.c M src/backend/access/transam/xlogrecovery.c M src/backend/backup/basebackup.c M src/backend/catalog/system_functions.sql M src/backend/catalog/system_views.sql M src/backend/postmaster/bgworker.c M src/backend/postmaster/postmaster.c M src/backend/postmaster/walsummarizer.c M src/backend/replication/logical/decode.c M src/backend/storage/ipc/procsignal.c M src/backend/utils/activity/pgstat_backend.c M src/backend/utils/adt/pgstatfuncs.c M src/backend/utils/init/miscinit.c M src/backend/utils/init/postinit.c M src/backend/utils/misc/guc_parameters.dat M src/backend/utils/misc/guc_tables.c M src/include/access/xlog_internal.h M src/include/catalog/pg_proc.dat M src/include/miscadmin.h M src/include/postmaster/proctypelist.h M src/include/storage/proc.h M src/include/storage/procsignal.h M src/test/modules/Makefile M src/test/modules/meson.build 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/test/modules/meson.build Auto-merging src/test/modules/Makefile Auto-merging src/include/storage/procsignal.h Auto-merging src/include/storage/proc.h CONFLICT (content): Merge conflict in src/include/storage/proc.h Auto-merging src/include/postmaster/proctypelist.h CONFLICT (content): Merge conflict in src/include/postmaster/proctypelist.h Auto-merging src/include/miscadmin.h Auto-merging src/include/catalog/pg_proc.dat Auto-merging src/include/access/xlog_internal.h Auto-merging src/backend/utils/misc/guc_tables.c CONFLICT (content): Merge conflict in src/backend/utils/misc/guc_tables.c Auto-merging src/backend/utils/misc/guc_parameters.dat Auto-merging src/backend/utils/init/postinit.c Auto-merging src/backend/utils/init/miscinit.c Auto-merging src/backend/utils/adt/pgstatfuncs.c Auto-merging src/backend/utils/activity/pgstat_backend.c Auto-merging src/backend/storage/ipc/procsignal.c Auto-merging src/backend/replication/logical/decode.c Auto-merging src/backend/postmaster/walsummarizer.c Auto-merging src/backend/postmaster/postmaster.c Auto-merging src/backend/postmaster/bgworker.c Auto-merging src/backend/catalog/system_views.sql Auto-merging src/backend/catalog/system_functions.sql Auto-merging src/backend/backup/basebackup.c Auto-merging src/backend/access/transam/xlogrecovery.c Auto-merging src/backend/access/transam/xlog.c Auto-merging doc/src/sgml/monitoring.sgml 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 Online enabling and disabling of data 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". Unstaged changes after reset: M doc/src/sgml/func/func-admin.sgml M doc/src/sgml/glossary.sgml M doc/src/sgml/images/Makefile M doc/src/sgml/monitoring.sgml M doc/src/sgml/ref/pg_checksums.sgml M doc/src/sgml/regress.sgml M doc/src/sgml/wal.sgml M src/backend/access/rmgrdesc/xlogdesc.c M src/backend/access/transam/xlog.c M src/backend/access/transam/xlogfuncs.c M src/backend/access/transam/xlogrecovery.c M src/backend/backup/basebackup.c M src/backend/catalog/system_functions.sql M src/backend/catalog/system_views.sql M src/backend/postmaster/Makefile M src/backend/postmaster/auxprocess.c M src/backend/postmaster/bgworker.c M src/backend/postmaster/meson.build M src/backend/postmaster/postmaster.c M src/backend/postmaster/walsummarizer.c M src/backend/replication/logical/decode.c M src/backend/storage/ipc/ipci.c M src/backend/storage/ipc/procsignal.c M src/backend/storage/page/README M src/backend/storage/page/bufpage.c M src/backend/utils/activity/pgstat_backend.c M src/backend/utils/activity/pgstat_io.c M src/backend/utils/activity/wait_event_names.txt M src/backend/utils/adt/pgstatfuncs.c M src/backend/utils/init/miscinit.c M src/backend/utils/init/postinit.c M src/backend/utils/misc/guc_parameters.dat M src/backend/utils/misc/guc_tables.c M src/bin/pg_checksums/pg_checksums.c M src/bin/pg_controldata/pg_controldata.c M src/bin/pg_upgrade/controldata.c M src/include/access/xlog.h M src/include/access/xlog_internal.h M src/include/catalog/pg_control.h M src/include/catalog/pg_proc.dat M src/include/commands/progress.h M src/include/miscadmin.h M src/include/postmaster/proctypelist.h M src/include/storage/bufpage.h M src/include/storage/checksum.h M src/include/storage/lwlocklist.h M src/include/storage/proc.h M src/include/storage/procsignal.h M src/include/utils/backend_progress.h M src/test/modules/Makefile M src/test/modules/meson.build M src/test/perl/PostgreSQL/Test/Cluster.pm M src/test/regress/expected/rules.out M src/test/regress/expected/stats.out M src/tools/pgindent/typedefs.list Removing doc/src/sgml/images/datachecksums.gv Removing doc/src/sgml/images/datachecksums.svg Removing src/backend/postmaster/datachecksumsworker.c Removing src/include/postmaster/datachecksumsworker.h Removing src/test/modules/test_checksums/ === using patch(1) to apply patch ./v20260305-0001-Online-enabling-and-disabling-of-data-chec.patch === patching file doc/src/sgml/func/func-admin.sgml Hunk #1 succeeded at 3121 (offset 34 lines). patching file doc/src/sgml/glossary.sgml patching file doc/src/sgml/images/Makefile patching file doc/src/sgml/images/datachecksums.gv patching file doc/src/sgml/images/datachecksums.svg patching file doc/src/sgml/monitoring.sgml patching file doc/src/sgml/ref/pg_checksums.sgml patching file doc/src/sgml/regress.sgml patching file doc/src/sgml/wal.sgml patching file src/backend/access/rmgrdesc/xlogdesc.c patching file src/backend/access/transam/xlog.c Hunk #6 succeeded at 4316 (offset -17 lines). Hunk #7 succeeded at 4656 (offset -17 lines). Hunk #8 succeeded at 4689 (offset -17 lines). Hunk #9 succeeded at 5387 (offset -17 lines). Hunk #10 succeeded at 5557 (offset -17 lines). Hunk #11 succeeded at 5636 (offset -17 lines). Hunk #12 succeeded at 6251 (offset -17 lines). Hunk #13 succeeded at 6718 (offset -17 lines). Hunk #14 succeeded at 7064 (offset -17 lines). Hunk #15 succeeded at 7642 (offset -7 lines). Hunk #16 succeeded at 7700 (offset -7 lines). Hunk #17 succeeded at 7767 (offset -7 lines). Hunk #18 succeeded at 7920 (offset -7 lines). Hunk #19 succeeded at 8066 (offset -7 lines). Hunk #20 succeeded at 8413 (offset -7 lines). Hunk #21 succeeded at 8831 (offset -7 lines). Hunk #22 succeeded at 8975 (offset -7 lines). Hunk #23 succeeded at 9039 (offset -7 lines). Hunk #24 succeeded at 9066 (offset -7 lines). Hunk #25 succeeded at 9106 (offset -7 lines). Hunk #26 succeeded at 9118 (offset -7 lines). Hunk #27 succeeded at 9311 (offset -7 lines). Hunk #28 succeeded at 9398 (offset -7 lines). patching file src/backend/access/transam/xlogfuncs.c patching file src/backend/access/transam/xlogrecovery.c patching file src/backend/backup/basebackup.c Hunk #1 succeeded at 1614 (offset 1 line). Hunk #2 succeeded at 1747 (offset 1 line). Hunk #3 succeeded at 1842 (offset 1 line). Hunk #4 succeeded at 1871 (offset 1 line). Hunk #5 succeeded at 1900 (offset 1 line). Hunk #6 succeeded at 2020 (offset 1 line). patching file src/backend/catalog/system_functions.sql Hunk #1 succeeded at 503 with fuzz 2 (offset -154 lines). Hunk #2 FAILED at 790. 1 out of 2 hunks FAILED -- saving rejects to file src/backend/catalog/system_functions.sql.rej patching file src/backend/catalog/system_views.sql Hunk #1 succeeded at 1406 (offset 21 lines). patching file src/backend/postmaster/Makefile patching file src/backend/postmaster/auxprocess.c patching file src/backend/postmaster/bgworker.c patching file src/backend/postmaster/datachecksumsworker.c patching file src/backend/postmaster/meson.build patching file src/backend/postmaster/postmaster.c patching file src/backend/postmaster/walsummarizer.c Hunk #1 succeeded at 1426 (offset -3 lines). patching file src/backend/replication/logical/decode.c patching file src/backend/storage/ipc/ipci.c patching file src/backend/storage/ipc/procsignal.c Hunk #1 FAILED at 18. Hunk #2 succeeded at 581 (offset 2 lines). 1 out of 2 hunks FAILED -- saving rejects to file src/backend/storage/ipc/procsignal.c.rej patching file src/backend/storage/page/README patching file src/backend/storage/page/bufpage.c patching file src/backend/utils/activity/pgstat_backend.c patching file src/backend/utils/activity/pgstat_io.c patching file src/backend/utils/activity/wait_event_names.txt patching file src/backend/utils/adt/pgstatfuncs.c Hunk #2 succeeded at 1181 (offset 12 lines). Hunk #3 succeeded at 1196 (offset 12 lines). patching file src/backend/utils/init/miscinit.c patching file src/backend/utils/init/postinit.c Hunk #1 succeeded at 757 (offset 8 lines). Hunk #2 succeeded at 903 (offset 8 lines). patching file src/backend/utils/misc/guc_parameters.dat patching file src/backend/utils/misc/guc_tables.c Hunk #1 succeeded at 501 (offset 10 lines). Hunk #2 succeeded at 636 (offset 10 lines). patching file src/bin/pg_checksums/pg_checksums.c patching file src/bin/pg_controldata/pg_controldata.c patching file src/bin/pg_upgrade/controldata.c patching file src/include/access/xlog.h patching file src/include/access/xlog_internal.h Hunk #2 succeeded at 288 (offset -2 lines). Hunk #3 succeeded at 310 (offset -2 lines). patching file src/include/catalog/pg_control.h patching file src/include/catalog/pg_proc.dat Hunk #1 succeeded at 12467 (offset 62 lines). patching file src/include/commands/progress.h patching file src/include/miscadmin.h patching file src/include/postmaster/datachecksumsworker.h patching file src/include/postmaster/proctypelist.h Hunk #1 FAILED at 38. 1 out of 1 hunk FAILED -- saving rejects to file src/include/postmaster/proctypelist.h.rej patching file src/include/storage/bufpage.h patching file src/include/storage/checksum.h patching file src/include/storage/lwlocklist.h patching file src/include/storage/proc.h Hunk #1 FAILED at 463. 1 out of 1 hunk FAILED -- saving rejects to file src/include/storage/proc.h.rej patching file src/include/storage/procsignal.h Hunk #1 succeeded at 48 (offset -8 lines). patching file src/include/utils/backend_progress.h patching file src/test/modules/Makefile patching file src/test/modules/meson.build patching file src/test/modules/test_checksums/.gitignore patching file src/test/modules/test_checksums/Makefile patching file src/test/modules/test_checksums/README patching file src/test/modules/test_checksums/meson.build patching file src/test/modules/test_checksums/t/001_basic.pl patching file src/test/modules/test_checksums/t/002_restarts.pl patching file src/test/modules/test_checksums/t/003_standby_restarts.pl patching file src/test/modules/test_checksums/t/004_offline.pl patching file src/test/modules/test_checksums/t/005_injection.pl patching file src/test/modules/test_checksums/t/006_pgbench_single.pl patching file src/test/modules/test_checksums/t/007_pgbench_standby.pl patching file src/test/modules/test_checksums/t/DataChecksums/Utils.pm patching file src/test/modules/test_checksums/test_checksums--1.0.sql patching file src/test/modules/test_checksums/test_checksums.c patching file src/test/modules/test_checksums/test_checksums.control patching file src/test/perl/PostgreSQL/Test/Cluster.pm patching file src/test/regress/expected/rules.out patching file src/test/regress/expected/stats.out patching file src/tools/pgindent/typedefs.list Hunk #1 succeeded at 429 (offset 1 line). Hunk #2 succeeded at 601 with fuzz 2 (offset 1 line). Hunk #3 succeeded at 626 (offset 2 lines). Hunk #4 succeeded at 4333 (offset 12 lines). Unstaged changes after reset: M doc/src/sgml/func/func-admin.sgml M doc/src/sgml/glossary.sgml M doc/src/sgml/images/Makefile M doc/src/sgml/monitoring.sgml M doc/src/sgml/ref/pg_checksums.sgml M doc/src/sgml/regress.sgml M doc/src/sgml/wal.sgml M src/backend/access/rmgrdesc/xlogdesc.c M src/backend/access/transam/xlog.c M src/backend/access/transam/xlogfuncs.c M src/backend/access/transam/xlogrecovery.c M src/backend/backup/basebackup.c M src/backend/catalog/system_functions.sql M src/backend/catalog/system_views.sql M src/backend/postmaster/Makefile M src/backend/postmaster/auxprocess.c M src/backend/postmaster/bgworker.c M src/backend/postmaster/meson.build M src/backend/postmaster/postmaster.c M src/backend/postmaster/walsummarizer.c M src/backend/replication/logical/decode.c M src/backend/storage/ipc/ipci.c M src/backend/storage/ipc/procsignal.c M src/backend/storage/page/README M src/backend/storage/page/bufpage.c M src/backend/utils/activity/pgstat_backend.c M src/backend/utils/activity/pgstat_io.c M src/backend/utils/activity/wait_event_names.txt M src/backend/utils/adt/pgstatfuncs.c M src/backend/utils/init/miscinit.c M src/backend/utils/init/postinit.c M src/backend/utils/misc/guc_parameters.dat M src/backend/utils/misc/guc_tables.c M src/bin/pg_checksums/pg_checksums.c M src/bin/pg_controldata/pg_controldata.c M src/bin/pg_upgrade/controldata.c M src/include/access/xlog.h M src/include/access/xlog_internal.h M src/include/catalog/pg_control.h M src/include/catalog/pg_proc.dat M src/include/commands/progress.h M src/include/miscadmin.h M src/include/storage/bufpage.h M src/include/storage/checksum.h M src/include/storage/lwlocklist.h M src/include/storage/procsignal.h M src/include/utils/backend_progress.h M src/test/modules/Makefile M src/test/modules/meson.build M src/test/perl/PostgreSQL/Test/Cluster.pm M src/test/regress/expected/rules.out M src/test/regress/expected/stats.out M src/tools/pgindent/typedefs.list Removing doc/src/sgml/images/datachecksums.gv Removing doc/src/sgml/images/datachecksums.svg Removing src/backend/catalog/system_functions.sql.rej Removing src/backend/postmaster/datachecksumsworker.c Removing src/backend/storage/ipc/procsignal.c.rej Removing src/include/postmaster/datachecksumsworker.h Removing src/include/postmaster/proctypelist.h.rej Removing src/include/storage/proc.h.rej Removing src/test/modules/test_checksums/ === using 'git apply' to apply patch ./v20260305-0001-Online-enabling-and-disabling-of-data-chec.patch === Applied patch to 'doc/src/sgml/func/func-admin.sgml' cleanly. Applied patch to 'doc/src/sgml/glossary.sgml' cleanly. Applied patch to 'doc/src/sgml/images/Makefile' cleanly. Falling back to direct application... Falling back to direct application... Applied patch to 'doc/src/sgml/monitoring.sgml' cleanly. Applied patch to 'doc/src/sgml/ref/pg_checksums.sgml' cleanly. Applied patch to 'doc/src/sgml/regress.sgml' cleanly. Applied patch to 'doc/src/sgml/wal.sgml' cleanly. Applied patch to 'src/backend/access/rmgrdesc/xlogdesc.c' cleanly. Applied patch to 'src/backend/access/transam/xlog.c' cleanly. Applied patch to 'src/backend/access/transam/xlogfuncs.c' cleanly. Applied patch to 'src/backend/access/transam/xlogrecovery.c' cleanly. Applied patch to 'src/backend/backup/basebackup.c' cleanly. Applied patch to 'src/backend/catalog/system_functions.sql' cleanly. Applied patch to 'src/backend/catalog/system_views.sql' cleanly. Applied patch to 'src/backend/postmaster/Makefile' cleanly. Applied patch to 'src/backend/postmaster/auxprocess.c' cleanly. Applied patch to 'src/backend/postmaster/bgworker.c' cleanly. Falling back to direct application... Applied patch to 'src/backend/postmaster/meson.build' cleanly. Applied patch to 'src/backend/postmaster/postmaster.c' cleanly. Applied patch to 'src/backend/postmaster/walsummarizer.c' cleanly. Applied patch to 'src/backend/replication/logical/decode.c' cleanly. Applied patch to 'src/backend/storage/ipc/ipci.c' cleanly. Applied patch to 'src/backend/storage/ipc/procsignal.c' cleanly. Applied patch to 'src/backend/storage/page/README' cleanly. Applied patch to 'src/backend/storage/page/bufpage.c' cleanly. Applied patch to 'src/backend/utils/activity/pgstat_backend.c' cleanly. Applied patch to 'src/backend/utils/activity/pgstat_io.c' cleanly. Applied patch to 'src/backend/utils/activity/wait_event_names.txt' cleanly. Applied patch to 'src/backend/utils/adt/pgstatfuncs.c' cleanly. Applied patch to 'src/backend/utils/init/miscinit.c' cleanly. Applied patch to 'src/backend/utils/init/postinit.c' cleanly. Applied patch to 'src/backend/utils/misc/guc_parameters.dat' cleanly. Applied patch to 'src/backend/utils/misc/guc_tables.c' with conflicts. Applied patch to 'src/bin/pg_checksums/pg_checksums.c' cleanly. Applied patch to 'src/bin/pg_controldata/pg_controldata.c' cleanly. Applied patch to 'src/bin/pg_upgrade/controldata.c' cleanly. Applied patch to 'src/include/access/xlog.h' cleanly. Applied patch to 'src/include/access/xlog_internal.h' cleanly. Applied patch to 'src/include/catalog/pg_control.h' cleanly. Applied patch to 'src/include/catalog/pg_proc.dat' cleanly. Applied patch to 'src/include/commands/progress.h' cleanly. Applied patch to 'src/include/miscadmin.h' cleanly. Falling back to direct application... Applied patch to 'src/include/postmaster/proctypelist.h' with conflicts. Applied patch to 'src/include/storage/bufpage.h' cleanly. Applied patch to 'src/include/storage/checksum.h' cleanly. Applied patch to 'src/include/storage/lwlocklist.h' cleanly. Applied patch to 'src/include/storage/proc.h' with conflicts. Applied patch to 'src/include/storage/procsignal.h' cleanly. Applied patch to 'src/include/utils/backend_progress.h' cleanly. Applied patch to 'src/test/modules/Makefile' cleanly. Applied patch to 'src/test/modules/meson.build' cleanly. Falling back to direct application... Falling back to direct application... Falling back to direct application... Falling back to direct application... Falling back to direct application... Falling back to direct application... Falling back to direct application... Falling back to direct application... Falling back to direct application... Falling back to direct application... Falling back to direct application... Falling back to direct application... Falling back to direct application... Falling back to direct application... Falling back to direct application... Applied patch to 'src/test/perl/PostgreSQL/Test/Cluster.pm' cleanly. Applied patch to 'src/test/regress/expected/rules.out' cleanly. Applied patch to 'src/test/regress/expected/stats.out' cleanly. Applied patch to 'src/tools/pgindent/typedefs.list' cleanly. U src/backend/utils/misc/guc_tables.c U src/include/postmaster/proctypelist.h U src/include/storage/proc.h diff --cc src/backend/utils/misc/guc_tables.c index 38aaf82f120,b657eab1119..00000000000 --- a/src/backend/utils/misc/guc_tables.c +++ b/src/backend/utils/misc/guc_tables.c @@@ -493,11 -491,11 +493,19 @@@ static const struct config_enum_entry f {NULL, 0, false} }; ++<<<<<<< ours +static const struct config_enum_entry file_extend_method_options[] = { +#ifdef HAVE_POSIX_FALLOCATE + {"posix_fallocate", FILE_EXTEND_METHOD_POSIX_FALLOCATE, false}, +#endif + {"write_zeros", FILE_EXTEND_METHOD_WRITE_ZEROS, false}, ++======= + static const struct config_enum_entry data_checksums_options[] = { + {"on", PG_DATA_CHECKSUM_VERSION, true}, + {"off", PG_DATA_CHECKSUM_OFF, true}, + {"inprogress-on", PG_DATA_CHECKSUM_INPROGRESS_ON_VERSION, true}, + {"inprogress-off", PG_DATA_CHECKSUM_INPROGRESS_OFF_VERSION, true}, ++>>>>>>> theirs {NULL, 0, false} }; diff --cc src/include/postmaster/proctypelist.h index feac19ba207,3c9aa1478fd..00000000000 --- a/src/include/postmaster/proctypelist.h +++ b/src/include/postmaster/proctypelist.h @@@ -30,22 -30,24 +30,46 @@@ */ ++<<<<<<< ours +/* bktype, bkcategory, description, main_func, shmem_attach */ +PG_PROCTYPE(B_ARCHIVER, "archiver", gettext_noop("archiver"), PgArchiverMain, true) +PG_PROCTYPE(B_AUTOVAC_LAUNCHER, "autovacuum", gettext_noop("autovacuum launcher"), AutoVacLauncherMain, true) +PG_PROCTYPE(B_AUTOVAC_WORKER, "autovacuum", gettext_noop("autovacuum worker"), AutoVacWorkerMain, true) +PG_PROCTYPE(B_BACKEND, "backend", gettext_noop("client backend"), BackendMain, true) +PG_PROCTYPE(B_BG_WORKER, "bgworker", gettext_noop("background worker"), BackgroundWorkerMain, true) +PG_PROCTYPE(B_BG_WRITER, "bgwriter", gettext_noop("background writer"), BackgroundWriterMain, true) +PG_PROCTYPE(B_CHECKPOINTER, "checkpointer", gettext_noop("checkpointer"), CheckpointerMain, true) +PG_PROCTYPE(B_DEAD_END_BACKEND, "backend", gettext_noop("dead-end client backend"), BackendMain, true) +PG_PROCTYPE(B_INVALID, "postmaster", gettext_noop("unrecognized"), NULL, false) +PG_PROCTYPE(B_IO_WORKER, "ioworker", gettext_noop("io worker"), IoWorkerMain, true) +PG_PROCTYPE(B_LOGGER, "syslogger", gettext_noop("syslogger"), SysLoggerMain, false) +PG_PROCTYPE(B_SLOTSYNC_WORKER, "slotsyncworker", gettext_noop("slotsync worker"), ReplSlotSyncWorkerMain, true) +PG_PROCTYPE(B_STANDALONE_BACKEND, "backend", gettext_noop("standalone backend"), NULL, false) +PG_PROCTYPE(B_STARTUP, "startup", gettext_noop("startup"), StartupProcessMain, true) +PG_PROCTYPE(B_WAL_RECEIVER, "walreceiver", gettext_noop("walreceiver"), WalReceiverMain, true) +PG_PROCTYPE(B_WAL_SENDER, "walsender", gettext_noop("walsender"), NULL, true) +PG_PROCTYPE(B_WAL_SUMMARIZER, "walsummarizer", gettext_noop("walsummarizer"), WalSummarizerMain, true) +PG_PROCTYPE(B_WAL_WRITER, "walwriter", gettext_noop("walwriter"), WalWriterMain, true) ++======= + /* bktype, description, main_func, shmem_attach */ + PG_PROCTYPE(B_ARCHIVER, gettext_noop("archiver"), PgArchiverMain, true) + PG_PROCTYPE(B_AUTOVAC_LAUNCHER, gettext_noop("autovacuum launcher"), AutoVacLauncherMain, true) + PG_PROCTYPE(B_AUTOVAC_WORKER, gettext_noop("autovacuum worker"), AutoVacWorkerMain, true) + PG_PROCTYPE(B_BACKEND, gettext_noop("client backend"), BackendMain, true) + PG_PROCTYPE(B_BG_WORKER, gettext_noop("background worker"), BackgroundWorkerMain, true) + PG_PROCTYPE(B_BG_WRITER, gettext_noop("background writer"), BackgroundWriterMain, true) + PG_PROCTYPE(B_CHECKPOINTER, gettext_noop("checkpointer"), CheckpointerMain, true) + PG_PROCTYPE(B_DATACHECKSUMSWORKER_LAUNCHER, gettext_noop("datachecksum launcher"), NULL, false) + PG_PROCTYPE(B_DATACHECKSUMSWORKER_WORKER, gettext_noop("datachecksum worker"), NULL, false) + PG_PROCTYPE(B_DEAD_END_BACKEND, gettext_noop("dead-end client backend"), BackendMain, true) + PG_PROCTYPE(B_INVALID, gettext_noop("unrecognized"), NULL, false) + PG_PROCTYPE(B_IO_WORKER, gettext_noop("io worker"), IoWorkerMain, true) + PG_PROCTYPE(B_LOGGER, gettext_noop("syslogger"), SysLoggerMain, false) + PG_PROCTYPE(B_SLOTSYNC_WORKER, gettext_noop("slotsync worker"), ReplSlotSyncWorkerMain, true) + PG_PROCTYPE(B_STANDALONE_BACKEND, gettext_noop("standalone backend"), NULL, false) + PG_PROCTYPE(B_STARTUP, gettext_noop("startup"), StartupProcessMain, true) + PG_PROCTYPE(B_WAL_RECEIVER, gettext_noop("walreceiver"), WalReceiverMain, true) + PG_PROCTYPE(B_WAL_SENDER, gettext_noop("walsender"), NULL, true) + PG_PROCTYPE(B_WAL_SUMMARIZER, gettext_noop("walsummarizer"), WalSummarizerMain, true) + PG_PROCTYPE(B_WAL_WRITER, gettext_noop("walwriter"), WalWriterMain, true) ++>>>>>>> theirs diff --cc src/include/storage/proc.h index 3f89450c216,4c90e27d1af..00000000000 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@@ -532,8 -468,6 +532,11 @@@ extern PGDLLIMPORT PGPROC *PreparedXact #define MAX_IO_WORKERS 32 #define NUM_AUXILIARY_PROCS (6 + MAX_IO_WORKERS) ++<<<<<<< ours +#define FIRST_PREPARED_XACT_PROC_NUMBER (MaxBackends + NUM_AUXILIARY_PROCS) + ++======= ++>>>>>>> theirs /* configurable options */ extern PGDLLIMPORT int DeadlockTimeout; extern PGDLLIMPORT int StatementTimeout;