pgsql: Add pg_strnlen() a portable implementation of strlen.
1 patchset tracked - current t206405_13
v13t206405_13posted Oct 10, 2017successwon't retryancient 9ypg 11
base82c117cb9 Oct 09, 2017 - 3267 days / 21809 commits behind master (from history)
applyapplied Aug 18, 16:55
rebaselast tried Aug 18, 16:55 on 195e8e427
Applying: Rewrite strnlen replacement implementation from 8a241792f96. Using index info to reconstruct a base tree... M configure A configure.in M src/backend/utils/mmgr/mcxt.c M src/common/string.c M src/include/common/string.h M src/include/pg_config.h.in A src/include/pg_config.h.win32 M src/include/port.h M src/port/snprintf.c Falling back to patching base and 3-way merge... Auto-merging src/port/snprintf.c CONFLICT (content): Merge conflict in src/port/snprintf.c Auto-merging src/include/port.h CONFLICT (content): Merge conflict in src/include/port.h CONFLICT (modify/delete): src/include/pg_config.h.win32 deleted in HEAD and modified in Rewrite strnlen replacement implementation from 8a241792f96.. Version Rewrite strnlen replacement implementation from 8a241792f96. of src/include/pg_config.h.win32 left in tree. Auto-merging src/include/pg_config.h.in CONFLICT (content): Merge conflict in src/include/pg_config.h.in Auto-merging src/include/common/string.h CONFLICT (content): Merge conflict in src/include/common/string.h Auto-merging src/common/string.c CONFLICT (content): Merge conflict in src/common/string.c Auto-merging src/backend/utils/mmgr/mcxt.c CONFLICT (content): Merge conflict in src/backend/utils/mmgr/mcxt.c Auto-merging configure.ac CONFLICT (content): Merge conflict in configure.ac Auto-merging configure CONFLICT (content): Merge conflict in configure Patch failed at 0001 Rewrite strnlen replacement implementation from 8a241792f96. 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/port/snprintf.c, src/include/port.h, src/include/pg_config.h.win32, src/include/pg_config.h.in, src/include/common/string.h, src/common/string.c, src/backend/utils/mmgr/mcxt.c, configure.ac, configure
pushAug 18, 16:55 -> c37102e82branchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| success | 1 | 11 | 467 / 467 | 1m 50s / 2m 37s | docker run ... :t206405 | Aug 18, 17:04 |
run 32162913234executed 467 - ccache 103 hit / 4881 miss - head c37102e82 - digest sha256:20512b8dc711ad... - run 32162913234 | ||||||