[PATCH] Fix duplicate errmsg in ALTER TABLE SPLIT PARTITION
1 patchset tracked - current t139401_19
v19t139401_19posted May 07, 12:29successwon't retrystale 59dpg 20
baseedc095a26 Aug 26, 09:59 on master
applyapplied Aug 26, 14:05
rebaselast tried Sep 24, 20:04 on df3978c23
Applying: Message improvements Using index info to reconstruct a base tree... M src/backend/partitioning/partbounds.c A src/test/regress/expected/partition_merge.out A src/test/regress/expected/partition_split.out Falling back to patching base and 3-way merge... CONFLICT (modify/delete): src/test/regress/expected/partition_split.out deleted in HEAD and modified in Message improvements. Version Message improvements of src/test/regress/expected/partition_split.out left in tree. CONFLICT (modify/delete): src/test/regress/expected/partition_merge.out deleted in HEAD and modified in Message improvements. Version Message improvements of src/test/regress/expected/partition_merge.out left in tree. Auto-merging src/backend/partitioning/partbounds.c CONFLICT (content): Merge conflict in src/backend/partitioning/partbounds.c Patch failed at 0001 Message improvements 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/test/regress/expected/partition_split.out, src/test/regress/expected/partition_merge.out, src/backend/partitioning/partbounds.c
pushAug 26, 14:06 -> b14e144edbranchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| success | 1 | 20 | 1024 / 1024 | 2m 45s / 4m 49s | docker run ... :t139401 | Aug 26, 14:18 |
run 32978190932executed 1024 - ccache 98 hit / 6525 miss - head b14e144ed - digest sha256:f63cfa1baf5357... - run 32978190932 | ||||||
| success | 1 | 20 | 1024 / 1024 | 2m 58s / 5m 10s | docker run ... @sha256:077dbfb... | Aug 25, 14:09 |
run 32856614121executed 1024 - ccache 98 hit / 6525 miss - head 3ba86b7a3 - digest sha256:077dbfb9922854... - run 32856614121 | ||||||
| success | 1 | 20 | 1023 / 1023 | 2m 51s / 5m 35s | docker run ... @sha256:ee413c4... | Aug 24, 14:08 |
run 32735777638executed 1023 - ccache 98 hit / 6525 miss - head 305dba8cf - digest sha256:ee413c45d467e5... - run 32735777638 | ||||||
| success | 1 | 20 | 1023 / 1023 | 2m 47s / 5m 28s | docker run ... @sha256:2a46921... | Aug 23, 14:08 |
run 32643922661executed 1023 - ccache 98 hit / 6525 miss - head 46203c8d0 - digest sha256:2a46921a7aacb1... - run 32643922661 | ||||||
| success | 1 | 20 | 1023 / 1023 | 3m 01s / 5m 43s | docker run ... @sha256:a933287... | Aug 22, 14:07 |
run 32577196158executed 1023 - ccache 98 hit / 6525 miss - head 91b2fcba1 - digest sha256:a9332874d9fce1... - run 32577196158 | ||||||
| success | 1 | 20 | 1023 / 1023 | 2m 54s / 5m 13s | docker run ... @sha256:921903c... | Aug 21, 14:05 |
run 32489323281executed 1023 - ccache 98 hit / 6525 miss - head 3b4a75710 - digest sha256:921903c02d75fb... - run 32489323281 | ||||||
| success | 1 | 20 | 1023 / 1023 | 2m 50s / 5m 34s | - | Aug 20, 14:03 |
run 32376790338executed 1023 - ccache 98 hit / 6525 miss - head dd7564493 - run 32376790338 | ||||||
| success | 1 | 20 | 1023 / 1023 | 2m 52s / 4m 52s | docker run ... @sha256:3e5516e... | Aug 19, 14:02 |
run 32260566624executed 1023 - ccache 98 hit / 6525 miss - head ef6834b1e - digest sha256:3e5516e10dd6e6... - run 32260566624 | ||||||
| success | 1 | 20 | 1021 / 1021 | 1m 58s / 4m 22s | docker run ... @sha256:2070a92... | Aug 18, 14:02 |
run 32144793628executed 1021 - ccache 98 hit / 6525 miss - head e1a84e7b0 - digest sha256:2070a92aca1d38... - run 32144793628 | ||||||