Remove toast_max_chunk_size from control file

back to CI dashboard

1 patchset tracked - current t253695_1

v1t253695_1posted Sep 07, 01:18successneeds rebaserecent 6dpg 20
base072d4c424 7 days ago on master
applyapplied 7 days ago
rebaselast tried about 12 hours ago on e73841ffb
Applying: Remove toast_max_chunk_size from pg_control
Using index info to reconstruct a base tree...
M	doc/src/sgml/func/func-info.sgml
M	src/backend/access/transam/xlog.c
M	src/backend/utils/misc/pg_controldata.c
M	src/bin/pg_controldata/pg_controldata.c
M	src/bin/pg_resetwal/pg_resetwal.c
M	src/bin/pg_upgrade/controldata.c
M	src/bin/pg_upgrade/pg_upgrade.h
M	src/include/catalog/pg_control.h
M	src/include/catalog/pg_proc.dat
Falling back to patching base and 3-way merge...
Auto-merging src/include/catalog/pg_proc.dat
Auto-merging src/include/catalog/pg_control.h
CONFLICT (content): Merge conflict in src/include/catalog/pg_control.h
Auto-merging src/bin/pg_upgrade/pg_upgrade.h
Auto-merging src/bin/pg_upgrade/controldata.c
Auto-merging src/bin/pg_resetwal/pg_resetwal.c
Auto-merging src/bin/pg_controldata/pg_controldata.c
Auto-merging src/backend/utils/misc/pg_controldata.c
Auto-merging src/backend/access/transam/xlog.c
Auto-merging doc/src/sgml/func/func-info.sgml
Patch failed at 0001 Remove toast_max_chunk_size from pg_control

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/catalog/pg_control.h
push7 days ago -> 6e9f648f1branchdiff vs base
ResultAttPGTestsBuild / testImageWhen
success1201023 / 10232m 54s / 5m 32sdocker run ... :t2536957 days ago
run 34796568193
executed 1023 - ccache 98 hit / 6523 miss - head 6e9f648f1 - digest sha256:4833ebd4b9234b... - run 34796568193
success1201023 / 10232m 39s / 4m 33sdocker run ... @sha256:6e1cb48...Sep 13, 01:45
run 34730881900
executed 1023 - ccache 98 hit / 6523 miss - head 5658a6483 - digest sha256:6e1cb48c011d2e... - run 34730881900
success1201023 / 10232m 44s / 4m 39sdocker run ... @sha256:41449c5...Sep 12, 01:43
run 34665165178
executed 1023 - ccache 98 hit / 6523 miss - head a22242ea8 - digest sha256:41449c59e6120f... - run 34665165178
success1201022 / 10222m 17s / 4m 21sdocker run ... @sha256:6efcbe2...Sep 11, 01:41
run 34550994327
executed 1022 - ccache 98 hit / 6523 miss - head 5cd21d801 - digest sha256:6efcbe21b7d5b9... - run 34550994327
success1201021 / 10212m 52s / 5m 05sdocker run ... @sha256:e1b9dda...Sep 10, 01:41
run 34425693282
executed 1021 - ccache 98 hit / 6523 miss - head b086dcf65 - digest sha256:e1b9ddadb68ed7... - run 34425693282
success1201020 / 10202m 52s / 5m 18sdocker run ... @sha256:95b9825...Sep 09, 01:39
run 34299278861
executed 1020 - ccache 98 hit / 6523 miss - head 5ad9b80b2 - digest sha256:95b98251e96f28... - run 34299278861
success1201020 / 10202m 39s / 4m 27sdocker run ... @sha256:cbfc6eb...Sep 08, 01:36
run 34176534331
executed 1020 - ccache 98 hit / 6523 miss - head 3549d420b - digest sha256:cbfc6eb7a4c4c5... - run 34176534331
success1201024 / 10242m 54s / 5m 29sdocker run ... @sha256:e036a9c...Sep 07, 01:36
run 34072752546
executed 1024 - ccache 98 hit / 6527 miss - head b4fce00b9 - digest sha256:e036a9ce94ecf5... - run 34072752546