[PATCH] Add NESTED_STATEMENTS option to EXPLAIN
1 patchset tracked - current t139662_8
v8t139662_8posted Jun 02, 03:01successwon't retrystale 7mopg 19
base4b1b2be22 May 08, 00:42 - 197 days / 1861 commits behind master (from history)
applyapplied Jul 28, 14:53
rebaselast tried Jul 28, 14:53 on 8a045f760
Applying: Add NESTED_STATEMENTS option to EXPLAIN Using index info to reconstruct a base tree... M doc/src/sgml/ref/explain.sgml M src/backend/commands/explain.c M src/backend/commands/trigger.c M src/include/commands/trigger.h Falling back to patching base and 3-way merge... Auto-merging src/include/commands/trigger.h CONFLICT (content): Merge conflict in src/include/commands/trigger.h Auto-merging src/backend/commands/trigger.c Auto-merging src/backend/commands/explain.c Auto-merging doc/src/sgml/ref/explain.sgml Patch failed at 0001 Add NESTED_STATEMENTS option to EXPLAIN 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"
conflicts on master: src/include/commands/trigger.h
pushJul 28, 14:53 -> ac8071250branchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| success | 1 | 19 | 999 / 999 | 2m 17s / 4m 18s | docker run ... :t139662 | Jul 28, 15:03 |
run 30370636013executed 999 - ccache 78 hit / 6541 miss - head ac8071250 - digest sha256:ff391069277d56... - run 30370636013 | ||||||