Merge trunk changes with this branch.

FossilOrigin-Name: e294a9c7c525d1da698259c2fef089579bfd1c0b

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

diff --cc manifest
index 9da3be262eec9b2f0a88af8f563f11d79fcccf4b,1acf1cc13a0b363bbcdc2f096e29b2758732ea68..b617e4ec121832970e200a887a284c1ff0e8f9af
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Have\sfts4\sfull-text\squeries\sconsider\s"docid<?"\sand\ssimilar\sconstraints.
- D 2013-09-30T11:42:19.862
 -C Fix\sa\sperformance\sproblem\sin\sthe\sFTS4\sauxiliary\sfunctions\striggered\sby\san\sOR\sclause\sin\sthe\sfull-text\squery.
 -D 2013-09-30T18:14:45.059
++C Merge\strunk\schanges\swith\sthis\sbranch.
++D 2013-09-30T18:16:07.269
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -78,9 -78,9 +78,9 @@@ F ext/fts3/README.content fdc666a70d525
  F ext/fts3/README.syntax a19711dc5458c20734b8e485e75fb1981ec2427a
  F ext/fts3/README.tokenizers e0a8b81383ea60d0334d274fadf305ea14a8c314
  F ext/fts3/README.txt 8c18f41574404623b76917b9da66fcb0ab38328d
- F ext/fts3/fts3.c 2dd0f461e03208dd05f04ab53729e361d7ce6043
 -F ext/fts3/fts3.c e1240ab6f5999174309a41ffac63b94ed1233098
++F ext/fts3/fts3.c 00a56dc5ce0527e8d1428831d460ff32e1ae45b9
  F ext/fts3/fts3.h 3a10a0af180d502cecc50df77b1b22df142817fe
 -F ext/fts3/fts3Int.h c7a451661c2d9b2440b2008c3f63ce06f13181d6
 +F ext/fts3/fts3Int.h 0634f768e7f6d5767972014e1ca83055ad2e09e3
  F ext/fts3/fts3_aux.c b02632f6dd0e375ce97870206d914ea6d8df5ccd
  F ext/fts3/fts3_expr.c f8eb1046063ba342c7114eba175cabb31c4a64e7
  F ext/fts3/fts3_hash.c 8dd2d06b66c72c628c2732555a32bc0943114914
@@@ -551,10 -552,9 +552,10 @@@ F test/fts3snippet.test d524af6bcef4714
  F test/fts3sort.test ed34c716a11cc2009a35210e84ad5f9c102362ca
  F test/fts3tok1.test b10d0a12a0ab5f905cea1200b745de233f37443f
  F test/fts3tok_err.test 52273cd193b9036282f7bacb43da78c6be87418d
- F test/fts4aa.test 95f448fb02c4a976968b08d1b4ce134e720946ae
+ F test/fts4aa.test 0c3152322c7f0b548cc942ad763eaba0da87ccca
  F test/fts4check.test 66fa274cab2b615f2fb338b257713aba8fad88a8
  F test/fts4content.test 2e7252557d6d24afa101d9ba1de710d6140e6d06
 +F test/fts4docid.test e33c383cfbdff0284685604d256f347a18fdbf01
  F test/fts4langid.test 24a6e41063b416bbdf371ff6b4476fa41c194aa7
  F test/fts4merge.test c424309743fdd203f8e56a1f1cd7872cd66cc0ee
  F test/fts4merge2.test 5faa558d1b672f82b847d2a337465fa745e46891
@@@ -1116,10 -1117,7 +1118,7 @@@ F tool/warnings-clang.sh f6aa929dc20ef1
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
  F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae
  F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
- P a6cd14effef0a4e5520eea871523e6e7a7d30aef
- R a6e5f48a9eab88e3a1e9daa8e6ce881a
- T *branch * fts4-docid-range-constraints
- T *sym-fts4-docid-range-constraints *
- T -sym-trunk *
 -P 604134732e309a738e21bcb4240b9ff285d2bfe4
 -R 6a5e216c5c51e185221e1c2d8a375388
++P 6622424a3a149edd35ba2ba0881aa41b4536417b fa0f2f0e3e79ae653118b901e1cca7725dfaf249
++R 5cf6afd99182ff167821268a5e701ab6
  U dan
- Z b22440ffe0dcdaa2ddd5b3fe1803c406
 -Z 83a6f701584057aa6ad5500f631da9c2
++Z 325d6a36551be1798f7d76b70cf41307

diff --cc manifest.uuid
index 0f5737202c3ca00b2e1ab791ea3705253331fa1f,3f571c42385a48d712fdb8d4124387486bd39d89..46abf742c09cb6943ac0017f725b3b514d6dd972
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 6622424a3a149edd35ba2ba0881aa41b4536417b
 -fa0f2f0e3e79ae653118b901e1cca7725dfaf249
++e294a9c7c525d1da698259c2fef089579bfd1c0b