=== Applying patches on top of PostgreSQL commit ID a12600b762c36d91450ce085fa25ef75250bc1c2 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Wed Sep 9 17:56:26 UTC 2026 On branch cf/7214 nothing to commit, working tree clean === using 'git am' to apply patch ./0001-Preserve-statistics-target-of-extended-statistics-re.patch === Applying: Preserve statistics target of extended statistics rebuilt by ALTER TABLE Using index info to reconstruct a base tree... M src/backend/commands/statscmds.c M src/backend/commands/tablecmds.c M src/backend/parser/gram.y M src/backend/parser/parse_utilcmd.c M src/include/nodes/parsenodes.h Falling back to patching base and 3-way merge... Auto-merging src/include/nodes/parsenodes.h Auto-merging src/backend/parser/parse_utilcmd.c Auto-merging src/backend/parser/gram.y Auto-merging src/backend/commands/tablecmds.c CONFLICT (content): Merge conflict in src/backend/commands/tablecmds.c Auto-merging src/backend/commands/statscmds.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 Preserve statistics target of extended statistics rebuilt by ALTER TABLE 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-Preserve-statistics-target-of-extended-statistics-re.patch === patching file src/backend/commands/statscmds.c patching file src/backend/commands/tablecmds.c Hunk #1 succeeded at 210 (offset -2 lines). Hunk #2 FAILED at 702. Hunk #3 succeeded at 16064 (offset -71 lines). Hunk #4 succeeded at 16074 (offset -71 lines). Hunk #5 succeeded at 16086 (offset -71 lines). Hunk #6 succeeded at 16109 (offset -71 lines). Hunk #7 succeeded at 16183 (offset -71 lines). Hunk #8 succeeded at 16202 (offset -71 lines). Hunk #9 succeeded at 16211 (offset -71 lines). Hunk #10 succeeded at 16235 (offset -71 lines). Hunk #11 FAILED at 16371. Hunk #12 succeeded at 16346 with fuzz 2 (offset -71 lines). 2 out of 12 hunks FAILED -- saving rejects to file src/backend/commands/tablecmds.c.rej patching file src/backend/parser/gram.y Hunk #1 succeeded at 4815 (offset -85 lines). Hunk #2 succeeded at 4829 (offset -85 lines). patching file src/backend/parser/parse_utilcmd.c Hunk #1 succeeded at 2169 (offset -3 lines). patching file src/include/nodes/parsenodes.h Hunk #1 succeeded at 3590 (offset -85 lines). patching file src/test/regress/expected/stats_ext.out patching file src/test/regress/sql/stats_ext.sql Unstaged changes after reset: M src/backend/commands/statscmds.c M src/backend/commands/tablecmds.c M src/backend/parser/gram.y M src/backend/parser/parse_utilcmd.c M src/include/nodes/parsenodes.h M src/test/regress/expected/stats_ext.out M src/test/regress/sql/stats_ext.sql Removing src/backend/commands/tablecmds.c.rej === using 'git apply' to apply patch ./0001-Preserve-statistics-target-of-extended-statistics-re.patch === Applied patch to 'src/backend/commands/statscmds.c' cleanly. Applied patch to 'src/backend/commands/tablecmds.c' with conflicts. Applied patch to 'src/backend/parser/gram.y' cleanly. Applied patch to 'src/backend/parser/parse_utilcmd.c' cleanly. Applied patch to 'src/include/nodes/parsenodes.h' cleanly. Applied patch to 'src/test/regress/expected/stats_ext.out' cleanly. Applied patch to 'src/test/regress/sql/stats_ext.sql' cleanly. U src/backend/commands/tablecmds.c diff --cc src/backend/commands/tablecmds.c index 8dc70bfa0f1,16e89e848d9..00000000000 --- a/src/backend/commands/tablecmds.c +++ b/src/backend/commands/tablecmds.c @@@ -672,7 -702,7 +673,11 @@@ static void RememberStatisticsForRebuil static void ATPostAlterTypeCleanup(List **wqueue, AlteredTableInfo *tab, LOCKMODE lockmode); static void ATPostAlterTypeParse(Oid oldId, Oid oldRelId, Oid refRelId, Oid ownerId, ++<<<<<<< ours + const char *cmdstring, List **wqueue, ++======= + int stxstattarget, char *cmd, List **wqueue, ++>>>>>>> theirs LOCKMODE lockmode, bool rewrite); static void RebuildConstraintComment(AlteredTableInfo *tab, AlterTablePass pass, Oid objid, Relation rel, List *domname, @@@ -16286,8 -16371,8 +16304,13 @@@ ATPostAlterTypeCleanup(List **wqueue, A */ static void ATPostAlterTypeParse(Oid oldId, Oid oldRelId, Oid refRelId, Oid ownerId, ++<<<<<<< ours + const char *cmdstring, List **wqueue, LOCKMODE lockmode, + bool rewrite) ++======= + int stxstattarget, char *cmd, List **wqueue, + LOCKMODE lockmode, bool rewrite) ++>>>>>>> theirs { List *raw_parsetree_list; List *querytree_list; @@@ -16330,8 -16415,9 +16353,9 @@@ { CreateStatsStmt *csstmt; - csstmt = transformStatsStmt(oldRelId, (CreateStatsStmt *) stmt, cmd); + csstmt = transformStatsStmt(oldRelId, (CreateStatsStmt *) stmt, cmdstring); csstmt->owner = ownerId; + csstmt->stxstattarget = stxstattarget; querytree_list = lappend(querytree_list, csstmt); }