From: dan <dan@noemail.net>
Date: Sat, 27 Aug 2016 18:34:06 +0000 (+0000)
Subject: Fixes to fts5 snippet() function.
X-Git-Tag: version-3.14.2~8^2~1^2~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=57b60432bab3cb3bedc5b5f18aef04a01d427b43;p=thirdparty%2Fsqlite.git

Fixes to fts5 snippet() function.

FossilOrigin-Name: d464a7b18d212720a4f4e2fa4e204f1aca99c837
---

57b60432bab3cb3bedc5b5f18aef04a01d427b43
diff --cc manifest
index d84e65cf09,6ce61f548e..6ec9fe1671
--- a/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Fix\sthe\sextra\scomments\s(added\swith\s-DSQLITE_ENABLE_EXPLAIN_COMMENTS)\sso\sthat\nthe\ssense\sof\s&lt;,\s&lt;=,\s&gt;,\sand\s&gt;=\stests\sis\scorrect\sand\sso\sthat\sthe\nSQLITE_STOREP2\sversion\sis\sshown\scorrectly.\s\sThese\schanges\sare\salready\sin\sthe\nrowvalue\sbranch\sbut\sare\sadded\shere\ssince\sthey\sare\stechnically\sunrelated\sto\nrowvalue.
- D 2016-08-27T14:05:12.248
 -C Fix\sa\sbug\sin\sthe\sfts5\ssnippet\sfunction\scausing\sit\sto\sreturn\stext\scontaining\szero\sphrase\sinstances.
 -D 2016-08-24T18:50:47.193
++C Fixes\sto\sfts5\ssnippet()\sfunction.
++D 2016-08-27T18:34:06.238
  F Makefile.in cfd8fb987cd7a6af046daa87daa146d5aad0e088
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 -F Makefile.msc d66d0395c38571aab3804f8db0fa20707ae4609a
 +F Makefile.msc 5017381e4853b1472e01d5bb926be1268eba429c
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION 25e2e333adeff5965520bc8db999c658898c972d
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -346,10 -346,10 +346,10 @@@ F src/global.c c45ea22aff29334f6a9ec549
  F src/hash.c 55b5fb474100cee0b901edaf203e26c970940f36
  F src/hash.h ab34c5c54a9e9de2e790b24349ba5aab3dbb4fd4
  F src/hwtime.h 747c1bbe9df21a92e9c50f3bbec1de841dc5e5da
 -F src/insert.c 8f4e9fcbd8e95e85f15647ba8b413b18d556ec2b
 +F src/insert.c 3edb5a1bda44df13531fedfcde5fbcc2fc04c222
  F src/legacy.c 75d3023be8f0d2b99d60f905090341a03358c58e
  F src/loadext.c dd7a2b77902cc66c22555aef02e1a682554b7aec
- F src/main.c 0bfcf1a5b612dddb4dd0fd04b53ef08ace0f48ff
 -F src/main.c 4f29b8d1b705fc3b73b26f892e85df2bfca31cff
++F src/main.c 9821bb4d2399bc5a0b8a5dfc06bede2d1520255c
  F src/malloc.c 1443d1ad95d67c21d77af7ae3f44678252f0efec
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 6919bcf12f221868ea066eec27e579fed95ce98b
@@@ -1511,7 -1510,7 +1511,7 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 7090147903337864d54ecfb2cd84a3f823973167
- R ad53b888d897b0241520026ffdb78d22
- U drh
- Z c3f9980f15e4ee005b5e39955b2d9131
 -P b56b2a85cf377686727f3929208ede43f797cf76
 -R d95861b85eb0fcd438ce646b06ec5daf
++P 4d43c4698eef4e3db7556813f0274b4018c7c2b9 b174ed2bde43a1872374ce18b85ac9f067e86fbb
++R 1806c129c8fa52174952b67042480d44
+ U dan
 -Z 1e5d85bd62c3d7d96772d546309a0d7d
++Z 3f2d594eefc4bc080c151857cd7756e9
diff --cc manifest.uuid
index a97e000e26,3fabbae740..aa38fb6b68
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 4d43c4698eef4e3db7556813f0274b4018c7c2b9
 -b174ed2bde43a1872374ce18b85ac9f067e86fbb
++d464a7b18d212720a4f4e2fa4e204f1aca99c837