Merge trunk changes into experimental fts3-prefix-search branch.

FossilOrigin-Name: f0f0a03db214b68a37069f64c27ae8520220c900

diff --cc ext/fts3/fts3.c
Simple merge

diff --cc manifest
index aff0cdf712f2e8da67ddd493867cda15cdaa62ce,1074285b3f6c8ed02067f26de92ac7ef8175b448..d0a1e8362586b3bc78aadceec8ec1803158c09c8
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Change\sfts4\sso\sthat\sthe\sprefix=\sparameter\sis\spasses\sa\scomma-separated\slist\sof\sintegers.\sFor\seach\sinteger\sN,\sa\sseparate\sindex\sof\sall\sprefixes\sof\slength\sN\sbytes\sis\screated.
- D 2011-05-25T18:34:53.807
 -C Fix\sa\scase\swhere\sa\smalloc()\serror\scould\slead\sto\smismatched\svirtual-table\sxBegin/xCommit/xRollback\scallbacks.
 -D 2011-05-25T18:46:22.024
++C Merge\strunk\schanges\sinto\sexperimental\sfts3-prefix-search\sbranch.
++D 2011-05-25T18:47:26.259
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 11dcc00a8d0e5202def00e81732784fb0cc4fe1d
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -61,10 -61,10 +61,10 @@@ F ext/fts2/mkfts2amal.tcl 974d5d438cb3f
  F ext/fts3/README.syntax a19711dc5458c20734b8e485e75fb1981ec2427a
  F ext/fts3/README.tokenizers 998756696647400de63d5ba60e9655036cb966e9
  F ext/fts3/README.txt 8c18f41574404623b76917b9da66fcb0ab38328d
- F ext/fts3/fts3.c 9ebda4cd406e5aa234977caa97c2045d36048753
 -F ext/fts3/fts3.c 0a2ae110f2d1806687ee0de837ac1eff106843b4
++F ext/fts3/fts3.c 925360f6c043fb87719e56520470265d69c5f870
  F ext/fts3/fts3.h 3a10a0af180d502cecc50df77b1b22df142817fe
 -F ext/fts3/fts3Int.h c8c0011c5e5b3a7703376ea6cd7deb91cfb96a06
 -F ext/fts3/fts3_aux.c 9e931f55eed8498dafe7bc1160f10cbb1a652fdf
 +F ext/fts3/fts3Int.h deeeac21d17da06683a79b40ae119b93cf86f90a
 +F ext/fts3/fts3_aux.c 2817a1ec9ffbad673cb1a1527ad807811bc7645b
  F ext/fts3/fts3_expr.c 5f49e0deaf723724b08100bb3ff40aab02ad0c93
  F ext/fts3/fts3_hash.c 3c8f6387a4a7f5305588b203fa7c887d753e1f1c
  F ext/fts3/fts3_hash.h 8331fb2206c609f9fc4c4735b9ab5ad6137c88ec
@@@ -939,7 -938,7 +939,7 @@@ F tool/speedtest8.c 2902c46588c40b55661
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P b5bdc639898ee22eebedeb560810e94e74de8aa4
- R e9f427c5bc714eae400763155f710174
 -P 6df99e52dabf2a243ad635529649b86c21735e91
 -R 02c26b8fd230a540c57276590c974e79
++P be59bf49402d2e2f4b95fb6668849f3745cb7bf2 d807304a695fc85402b86e1cd32a6e3bbb2823c8
++R 2e09e5d0236bf18c24c777dcd7acf739
  U dan
- Z 6f0f673a9e9eaf0f72d887565c9f2227
 -Z e2a23225f8e5abceac6a8fe1d14982ec
++Z fd8764569a495dba32fc732cd25f7598

diff --cc manifest.uuid
index 3ae4c6e5e2f67056ba55158dd43ad9d12ee901d8,5b49fb4d2dce86ce9633f1f35606138bf2629505..00ceff796f459e740ddc5b1d08a32b8d69c7fcae
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- be59bf49402d2e2f4b95fb6668849f3745cb7bf2
 -d807304a695fc85402b86e1cd32a6e3bbb2823c8
++f0f0a03db214b68a37069f64c27ae8520220c900