pgsql: Allow GRANT on pg_log_backend_memory_contexts().

back to CI dashboard

1 patchset tracked - current t225378_3

v3t225378_3posted Oct 27, 2021successwon't retryancient 5ypg 15
basef0b051e32 Oct 26, 2021 - 1789 days / 13013 commits behind master (from history)
applyapplied Jul 29, 00:45
rebaselast tried Jul 29, 00:45 on dd50eb914
Applying: add docs and error test case for pg_log_backend_memory_contexts
Using index info to reconstruct a base tree...
A	doc/src/sgml/func.sgml
M	src/test/regress/expected/misc_functions.out
M	src/test/regress/sql/misc_functions.sql
Falling back to patching base and 3-way merge...
Auto-merging src/test/regress/sql/misc_functions.sql
Auto-merging src/test/regress/expected/misc_functions.out
CONFLICT (modify/delete): doc/src/sgml/func.sgml deleted in HEAD and modified in add docs and error test case for pg_log_backend_memory_contexts. Version add docs and error test case for pg_log_backend_memory_contexts of doc/src/sgml/func.sgml left in tree.
Patch failed at 0001 add docs and error test case for pg_log_backend_memory_contexts

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: doc/src/sgml/func.sgml
pushJul 29, 00:45 -> 332e0898dbranchdiff vs base
ResultAttPGTestsBuild / testImageWhen
success115632 / 6322m 15s / 3m 15sdocker run ... :t225378Jul 29, 00:53
run 30412067724
executed 632 - ccache 190 hit / 4189 miss - head 332e0898d - digest sha256:8f06819b79b62b... - run 30412067724