Merge the latest trunk changes into the fts3-prefix-search branch.

FossilOrigin-Name: 567dd84359218245d4e6887547e2a48881f2c8e0

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

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

diff --cc manifest
index e6e2af3449f28a1b0a569f7aa832a49f14a3f9f9,9f7ebae4ea49b0eb9c718a4b46707377d2efb72f..8000db4360d864afbdb4cee804d27df265bc27c2
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Modify\sfts3rnd.test\sto\srun\stests\sfor\sboth\s"ORDER\sBY\sdocid\sASC"\sand\s"ORDER\sBY\sdocid\sDESC"\swith\sboth\sorder=ASC\sand\sorder=DESC\sFTS\stables.\sFixes\sfor\ssome\sbugs\sfound.
- D 2011-06-06T14:51:50.541
 -C Add\sassert()\sstatements\sto\sverify\sthat\su16\spointers\sassociated\swith\nthe\senhancement\sin\s[897f56a158]\sare\salways\s2-byte\saligned.
 -D 2011-06-06T13:38:11.704
++C Merge\sthe\slatest\strunk\schanges\sinto\sthe\sfts3-prefix-search\sbranch.
++D 2011-06-06T18:14:25.721
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 11dcc00a8d0e5202def00e81732784fb0cc4fe1d
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -61,11 -61,11 +61,11 @@@ 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 aafc143b59710e85a6215e8843aa2802f38397bc
 -F ext/fts3/fts3.c b3a10a1a320aaeb56a1dd6710bf09eb5c2370839
++F ext/fts3/fts3.c d0970d9fa0a63ac470007ac5e14645f5b874b70f
  F ext/fts3/fts3.h 3a10a0af180d502cecc50df77b1b22df142817fe
 -F ext/fts3/fts3Int.h c8c0011c5e5b3a7703376ea6cd7deb91cfb96a06
 -F ext/fts3/fts3_aux.c 97c960b1b0d371c08eae6b8565dfac619eb9d979
 -F ext/fts3/fts3_expr.c 5f49e0deaf723724b08100bb3ff40aab02ad0c93
 +F ext/fts3/fts3Int.h d76b021d5b7061eff7aa4055b5938eebef2bdb6a
- F ext/fts3/fts3_aux.c 28fc512608e147015c36080025456f57f571f76f
++F ext/fts3/fts3_aux.c baed9dab7fb4604ae8cafdb2d7700abe93beffbe
 +F ext/fts3/fts3_expr.c 0ae554230ada457e61e8184b24faac96aad78f6b
  F ext/fts3/fts3_hash.c 3c8f6387a4a7f5305588b203fa7c887d753e1f1c
  F ext/fts3/fts3_hash.h 8331fb2206c609f9fc4c4735b9ab5ad6137c88ec
  F ext/fts3/fts3_icu.c ac494aed69835008185299315403044664bda295
@@@ -938,8 -939,10 +940,10 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
+ F tool/symbols.sh bc2a3709940d47c8ac8e0a1fdf17ec801f015a00
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P 0425138a2365d23b07d88fda2b1f458f112f389d
- R bea111e886e30c118babca4cc7623bc5
- U dan
- Z 6f031e903f656ed90101feb3a80e60ca
+ F tool/warnings.sh 347d974d143cf132f953b565fbc03026f19fcb4d
 -P 65db822f200bafe9abe59b33b17b2c643c17c5e8
 -R 6f20bbc84376df4d202ff7744a749f24
++P 89f2f482e077241ac29a58eadf44a72a9c01f98c 98ccfa930e8e5f10808a518e3e22e85e8a8a65c2
++R b612d83743a894702aacbc42c433c9e9
+ U drh
 -Z b952c48c970134cec62f175ed76931db
++Z c6414e08a953b76b4b33ed29bc763b72

diff --cc manifest.uuid
index 118c979d31b1583c262bd887c61ce8f79c099007,4a6c7d51ec8b52c7f3d033ec42160232d8e820ce..577710ac6fdd1af463d6fbde8dca852bc6d26a5f
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 89f2f482e077241ac29a58eadf44a72a9c01f98c
 -98ccfa930e8e5f10808a518e3e22e85e8a8a65c2
++567dd84359218245d4e6887547e2a48881f2c8e0