[PATCH] Optionally record Plan IDs to track plan changes for a query

Applying: Add plan_id support to the core.
Using index info to reconstruct a base tree...
M	doc/src/sgml/config.sgml
M	doc/src/sgml/monitoring.sgml
M	src/backend/catalog/system_views.sql
M	src/backend/commands/explain.c
M	src/backend/executor/execMain.c
M	src/backend/nodes/gen_node_support.pl
M	src/backend/nodes/queryjumblefuncs.c
M	src/backend/optimizer/plan/planner.c
M	src/backend/optimizer/plan/setrefs.c
M	src/backend/postmaster/launch_backend.c
M	src/backend/utils/adt/pgstatfuncs.c
M	src/backend/utils/misc/guc_parameters.dat
M	src/backend/utils/misc/guc_tables.c
M	src/backend/utils/misc/postgresql.conf.sample
M	src/include/catalog/pg_proc.dat
M	src/include/nodes/pathnodes.h
M	src/include/nodes/plannodes.h
M	src/include/nodes/primnodes.h
M	src/include/nodes/queryjumble.h
M	src/include/utils/backend_status.h
M	src/test/regress/expected/explain.out
M	src/test/regress/expected/rules.out
M	src/test/regress/sql/explain.sql
Falling back to patching base and 3-way merge...
Auto-merging src/test/regress/sql/explain.sql
Auto-merging src/test/regress/expected/rules.out
Auto-merging src/test/regress/expected/explain.out
Auto-merging src/include/utils/backend_status.h
Auto-merging src/include/nodes/queryjumble.h
Auto-merging src/include/nodes/primnodes.h
CONFLICT (content): Merge conflict in src/include/nodes/primnodes.h
Auto-merging src/include/nodes/plannodes.h
CONFLICT (content): Merge conflict in src/include/nodes/plannodes.h
Auto-merging src/include/nodes/pathnodes.h
Auto-merging src/include/catalog/pg_proc.dat
Auto-merging src/backend/utils/misc/postgresql.conf.sample
Auto-merging src/backend/utils/misc/guc_tables.c
Auto-merging src/backend/utils/misc/guc_parameters.dat
Auto-merging src/backend/utils/adt/pgstatfuncs.c
Auto-merging src/backend/postmaster/launch_backend.c
Auto-merging src/backend/optimizer/plan/setrefs.c
Auto-merging src/backend/optimizer/plan/planner.c
Auto-merging src/backend/nodes/queryjumblefuncs.c
CONFLICT (content): Merge conflict in src/backend/nodes/queryjumblefuncs.c
Auto-merging src/backend/nodes/gen_node_support.pl
Auto-merging src/backend/executor/execMain.c
Auto-merging src/backend/commands/explain.c
Auto-merging src/backend/catalog/system_views.sql
Auto-merging doc/src/sgml/monitoring.sgml
Auto-merging doc/src/sgml/config.sgml
Patch failed at 0001 Add plan_id support to the core.

/ci/repo/worktrees/worktree/rebase-apply/patch:252: trailing whitespace.
 * 
/ci/repo/worktrees/worktree/rebase-apply/patch:282: trailing whitespace.
 * 
/ci/repo/worktrees/worktree/rebase-apply/patch:284: trailing whitespace.
 * 
/ci/repo/worktrees/worktree/rebase-apply/patch:287: trailing whitespace.
 * 
/ci/repo/worktrees/worktree/rebase-apply/patch:289: trailing whitespace.
 * 
warning: 5 lines add whitespace errors.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"