From: dan <dan@noemail.net>
Date: Tue, 14 Jun 2011 11:50:09 +0000 (+0000)
Subject: Merge fts3-prefix-search branch with trunk.
X-Git-Tag: version-3.7.7~62
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=79bd81038c30c552fc4e36cdf95520ea1134633a;p=thirdparty%2Fsqlite.git

Merge fts3-prefix-search branch with trunk.

FossilOrigin-Name: b1f9c1e0ac51cedfb05ac073a603343f6df865b5
---

79bd81038c30c552fc4e36cdf95520ea1134633a
diff --cc manifest
index 404f96248e,bc0807804f..3f4c162a0d
--- a/manifest
+++ b/manifest
@@@ -1,7 -1,7 +1,7 @@@
- C Use\sonly\sunsigned\svalues\sin\sthe\simplementatin\sof\sLIKE\sand\sGLOB\sso\sthat\nvalues\swon't\soverflow\sto\snegative\swhen\sdealing\swith\smalformed\sUTF8.
- D 2011-06-13T12:19:21.072
 -C Add\sa\scouple\sof\sextra\stests.
 -D 2011-06-14T11:32:50.766
++C Merge\sfts3-prefix-search\sbranch\swith\strunk.
++D 2011-06-14T11:50:09.808
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 11dcc00a8d0e5202def00e81732784fb0cc4fe1d
+ F Makefile.in c1d7a7f4fd8da6b1815032efca950e3d5125407e
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
  F Makefile.vxworks c85ec1d8597fe2f7bc225af12ac1666e21379151
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
@@@ -942,7 -945,7 +945,7 @@@ F tool/split-sqlite3c.tcl d9be87f1c3402
  F tool/symbols.sh bc2a3709940d47c8ac8e0a1fdf17ec801f015a00
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings.sh 347d974d143cf132f953b565fbc03026f19fcb4d
- P 2b3d9996a829c62fbaf7c92d50e44636340b07c6
- R 901f548a763eaba41771c9603ccfd6ef
- U drh
- Z 700a00fc01c336d2e1728d856de33900
 -P 04907fbadeb743c95cc9f3529e63ef388684799f
++P 77f01578bb565d1bc884b374b68bae10ce34a084 aefd46dfae7e06fbaf4f2b9a86a7f2ac6927331e
+ R 84da75d7a3a06308ee488ec7371657d8
+ U dan
 -Z 0b29b5535d6bfbaa65e9d19cac80576d
++Z 26ae4ebe97429ca9da8c05064a989555
diff --cc manifest.uuid
index 37f82214ef,3ddb9fa573..0816af7d24
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 77f01578bb565d1bc884b374b68bae10ce34a084
 -aefd46dfae7e06fbaf4f2b9a86a7f2ac6927331e
++b1f9c1e0ac51cedfb05ac073a603343f6df865b5