Merge latest changes from trunk. Including fts5_expr.c fixes.

FossilOrigin-Name: 716e7e747714d6af502f6a87ca8d789bb7ce162a

diff --cc main.mk
Simple merge

diff --cc manifest
index 560d89188180f6f3b0f2a21feaa066108f590dc8,a73e1f29f1f890fde14735513708747702ec4ea4..135394a387b62547649b090ff2773e5241de5cd8
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Update\sdescription\sof\son-disk\sformat\sin\sfts5_index.c.
- D 2015-09-10T15:49:16.123
 -C Make\sthe\ssqlite3ext.h\sheader\sfile\sresponsive\sto\s-DSQLITE_OMIT_LOAD_EXTENSION.
 -D 2015-09-10T15:24:27.984
++C Merge\slatest\schanges\sfrom\strunk.\sIncluding\sfts5_expr.c\sfixes.
++D 2015-09-10T15:52:42.491
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in f85066ce844a28b671aaeeff320921cd0ce36239
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -106,14 -106,14 +106,14 @@@ F ext/fts3/unicode/mkunicode.tcl 95cf7e
  F ext/fts3/unicode/parseunicode.tcl da577d1384810fb4e2b209bf3313074353193e95
  F ext/fts5/extract_api_docs.tcl a36e54ec777172ddd3f9a88daf593b00848368e0
  F ext/fts5/fts5.h f04659e0df5af83731b102189a32280f74f4a6bc
 -F ext/fts5/fts5Int.h f65d41f66accad0a289d6bd66b13c07d2932f9be
 +F ext/fts5/fts5Int.h 7e6002582133cb795a21468732cf7c35027a28e4
  F ext/fts5/fts5_aux.c 7a307760a9c57c750d043188ec0bad59f5b5ec7e
 -F ext/fts5/fts5_buffer.c 80f9ba4431848cb857e3d2158f5280093dcd8015
 -F ext/fts5/fts5_config.c 80b61fd2c6844b64a3e72a64572d50a812da9384
 +F ext/fts5/fts5_buffer.c 64dcaf36a3ebda9e84b7c3b8788887ec325e12a4
 +F ext/fts5/fts5_config.c 57ee5fe71578cb494574fc0e6e51acb9a22a8695
- F ext/fts5/fts5_expr.c 1c24e1a2ffb286bfe37e537a43b7fadabfe993d4
+ F ext/fts5/fts5_expr.c a7726fe7045eec7caca8a074af747c8ea3545b83
  F ext/fts5/fts5_hash.c 4bf4b99708848357b8a2b5819e509eb6d3df9246
 -F ext/fts5/fts5_index.c 950e37028cc81ae21534819e79c73aea7efa6c8e
 -F ext/fts5/fts5_main.c e9d0892424bb7f0a8b58613d4ff75cb650cf286e
 +F ext/fts5/fts5_index.c bd2b6e63c1ed8329176d73a9491023eaf06c572f
 +F ext/fts5/fts5_main.c 4b04c934084ea24a858438a04b5be8af3a9e0311
  F ext/fts5/fts5_storage.c 120f7b143688b5b7710dacbd48cff211609b8059
  F ext/fts5/fts5_tcl.c 6da58d6e8f42a93c4486b5ba9b187a7f995dee37
  F ext/fts5/fts5_test_mi.c e96be827aa8f571031e65e481251dc1981d608bf
@@@ -261,7 -260,7 +261,7 @@@ F ext/userauth/userauth.c 5fa3bdb492f48
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk 2bef49d698dd47369083c148387b4e57fc5bb82b
 -F main.mk 58eb74de702467c3b71cdf06f213cefe7f5ce544
++F main.mk 354f24951fcc2efd62aef684f2ae44e1128bfbeb
  F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea
  F mkopcodeh.awk 0e7f04a8eb90f92259e47d80110e4e98d7ce337a
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
@@@ -1384,7 -1384,7 +1385,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 402704b13f1f246c0224f90862bed93a825575f1
- R 8542b70a40880b96616f617c0f724216
 -P bb8ee3b140a0a8b7c89f5debf22369f204ceef0b
 -R 9f03517d27368f0ee452371692eeb689
 -U drh
 -Z 40738b9489636e13edf984d114f41f8e
++P 85aac7b8b6731e2f6880b80cfd62d431ea059799 47a46a9fa4a96cdb96a20b6aec802661b1ee4598
++R c5f7ba1eb5032deaf906327db459f6d6
 +U dan
- Z bec11568386511f97c280f2faaeb0846
++Z 7d64753f9bb762353618192be20f88c2

diff --cc manifest.uuid
index 580a4356916f505e86c51d50a7b86fe2f9d9616b,54212ec5b77d8f2f426352432498501b34ce1591..30fcdc4197f2f63946eea6526c43203593b14836
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 85aac7b8b6731e2f6880b80cfd62d431ea059799
 -47a46a9fa4a96cdb96a20b6aec802661b1ee4598
++716e7e747714d6af502f6a87ca8d789bb7ce162a