[PATCH] Fix for bug #19474: LIKE fails to match literal backslashes with nondeterministic collations

back to CI dashboard

1 patchset tracked - current t139638_9

v9t139638_9posted Jul 06, 18:48successwon't retrystale 3mopg 20
base2d7808e6f Jul 06, 17:06 - 75 days / 769 commits behind master (from history)
applyapplied Aug 18, 13:37
rebaselast tried Aug 18, 13:37 on 033f39e69
Applying: Fix LIKE matching with nondeterministic collations and backslashes
Using index info to reconstruct a base tree...
M	src/backend/utils/adt/like_match.c
M	src/test/regress/expected/collate.icu.utf8.out
M	src/test/regress/sql/collate.icu.utf8.sql
Falling back to patching base and 3-way merge...
Auto-merging src/test/regress/sql/collate.icu.utf8.sql
Auto-merging src/test/regress/expected/collate.icu.utf8.out
Auto-merging src/backend/utils/adt/like_match.c
CONFLICT (content): Merge conflict in src/backend/utils/adt/like_match.c
Patch failed at 0001 Fix LIKE matching with nondeterministic collations and backslashes

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/backend/utils/adt/like_match.c
pushAug 18, 13:38 -> e41eac55abranchdiff vs base
ResultAttPGTestsBuild / testImageWhen
success1201008 / 10082m 38s / 5m 26sdocker run ... :t139638Aug 18, 13:49
run 32143506299
executed 1008 - ccache 609 hit / 6011 miss - head e41eac55a - digest sha256:5d5e6a5b510bb5... - run 32143506299