pgsql: Add more efficient functions to pqformat API.

back to CI dashboard

1 patchset tracked - current t206433_2

v2t206433_2posted Nov 30, 2017successwon't retryancient 9ypg 11
base5229db6c6 Oct 13, 2017 - 3263 days / 21776 commits behind master (from history)
applyapplied Jul 29, 00:50
rebaselast tried Jul 29, 00:50 on dd50eb914
Applying: Fix warnings from cpluspluscheck
Using index info to reconstruct a base tree...
M	src/include/libpq/pqformat.h
Falling back to patching base and 3-way merge...
Auto-merging src/include/libpq/pqformat.h
CONFLICT (content): Merge conflict in src/include/libpq/pqformat.h
Patch failed at 0001 Fix warnings from cpluspluscheck

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/libpq/pqformat.h
pushJul 29, 00:50 -> 660249c7cbranchdiff vs base
ResultAttPGTestsBuild / testImageWhen
success111467 / 4671m 45s / 2m 36sdocker run ... :t206433Jul 29, 01:04
run 30412318330
executed 467 - ccache 117 hit / 4868 miss - head 660249c7c - digest sha256:eebfa8eacd234d... - run 30412318330