Merge latest trunk changes into this branch.

FossilOrigin-Name: e7dcd013516723941c2fb78ecdc96806d49d310b

diff --cc ext/fts5/fts5_expr.c
Simple merge

diff --cc ext/fts5/fts5_main.c
Simple merge

diff --cc ext/fts5/fts5_storage.c
Simple merge

diff --cc manifest
index 39b91273fa6b26273ca45d2f0ea9ad7bd71acd23,d238fa51c27408356076d0a35acd1a9b990b0992..b6ae4ac81891b73dd6b7476d3b118db5e83cb392
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Fix\san\sfts5\sproblem\sinvolving\sdetail=none,\s"ORDER\sBY\srowid\sDESC"\sand\sdeleted\sitems.\sAlso\sadd\stests\sto\sverify\sthat\sthe\sdocumented\soperator\sprecedences\sare\scorrect.
- D 2016-01-06T18:53:57.055
- F Makefile.in 28bcd6149e050dff35d4dcfd97e890cd387a499d
 -C Disable\sthe\s--limit-mem\soption\son\sfuzzcheck\sunless\sthe\sSQLITE_ENABLE_MEMSYS5\sor\nSQLITE_ENABLE_MEMSYS3\scompile-time\soptions\sare\sused.
 -D 2016-01-06T15:54:53.139
++C Merge\slatest\strunk\schanges\sinto\sthis\sbranch.
++D 2016-01-06T19:35:52.285
+ F Makefile.in 7c8cc4c2f0179efc6fa9492141d1fb65f4807054
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc 5fff077fcc46de7714ed6eebb6159a4c00eab751
+ F Makefile.msc e45d8b9b56dfa3f2cd860b2c28bd9d304513b042
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION 8b9d3ac6f1962f94e06ba05462422a544f9c4e36
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -96,19 -96,19 +96,19 @@@ F ext/fts3/unicode/UnicodeData.txt cd07
  F ext/fts3/unicode/mkunicode.tcl 95cf7ec186e48d4985e433ff8a1c89090a774252
  F ext/fts3/unicode/parseunicode.tcl da577d1384810fb4e2b209bf3313074353193e95
  F ext/fts5/extract_api_docs.tcl a36e54ec777172ddd3f9a88daf593b00848368e0
 -F ext/fts5/fts5.h 8b9a13b309b180e9fb88ea5666c0d8d73c6102d9
 -F ext/fts5/fts5Int.h acf968e43d57b6b1caf7554d34ec35d6ed3b4fe8
 +F ext/fts5/fts5.h 88fec577a2148f34df75930dc2b0c45b0bad72c3
 +F ext/fts5/fts5Int.h 3918045ebceb1d600c9c1c1b460489ff0c788e96
- F ext/fts5/fts5_aux.c 1f384972d606375b8fa078319f25ab4b5feb1b35
+ F ext/fts5/fts5_aux.c 2dafc3aee0c70d643140c77d8d70daffa51a9e9e
 -F ext/fts5/fts5_buffer.c 1e49512a535045e621246dc7f4f65f3593fa0fc2
 -F ext/fts5/fts5_config.c 0ee66188609a62342e9f9aeefa3c3e44518a4dd6
 -F ext/fts5/fts5_expr.c 8228aca3e9af626a1ca9b093d4d24b4f2488ad23
 -F ext/fts5/fts5_hash.c 25838d525e97f8662ff3504be94d0bad24f9a37e
 -F ext/fts5/fts5_index.c 578f46697080f11a1e26cd45a1c039c043a3111d
 -F ext/fts5/fts5_main.c e11b525778e6fce416d916bfa96926bd1ce4616d
 -F ext/fts5/fts5_storage.c 57c636d87cbb829d6147c8c8bf78fa53b9ebb526
 -F ext/fts5/fts5_tcl.c 3bf445e66de32137d4693694ff7b1fd6074e32bd
 -F ext/fts5/fts5_test_mi.c e96be827aa8f571031e65e481251dc1981d608bf
 +F ext/fts5/fts5_buffer.c 87204c8b3b8bc62b27376eab09b74d6d5acc41f1
 +F ext/fts5/fts5_config.c b0ed7b0ddd785fb4d4e6f9037d357f8aa95918e6
- F ext/fts5/fts5_expr.c 5d5dd3044c1a39ace6ddd1034961fd5278ffce2d
++F ext/fts5/fts5_expr.c 913ab9f9a7651d76f055f9847ca0ae0e2f5da78d
 +F ext/fts5/fts5_hash.c 1b113977296cf4212c6ec667d5e3f2bd18036955
 +F ext/fts5/fts5_index.c 04fe098ffab66d9424ba4e7c0b88ce7c98748cb1
- F ext/fts5/fts5_main.c cd5f6f0bf868a19e8f8ef01c7b4b86dd152f0bc7
- F ext/fts5/fts5_storage.c 771dd0fda3ee513e32937a386dc2a4aa2d9ea64e
++F ext/fts5/fts5_main.c 03bd44e4bd0ba16213ca9259ad5df1d4d743fd7e
++F ext/fts5/fts5_storage.c f7b2d330dd7b29a9f4da09f6d85879ca8c41b2e8
 +F ext/fts5/fts5_tcl.c 18e9382d8cdad4c05b49559c68494968b9b4a4fb
 +F ext/fts5/fts5_test_mi.c 1ec66ffdf7632077fbd773b7a6df5153272ec070
- F ext/fts5/fts5_tokenize.c 618efe033bceb80c521b1e9ddfd9fee85fb5946e
+ F ext/fts5/fts5_tokenize.c 504984ac6993323247221eebe3cd55bead01b5f8
  F ext/fts5/fts5_unicode2.c 78273fbd588d1d9bd0a7e4e0ccc9207348bae33c
  F ext/fts5/fts5_varint.c 3f86ce09cab152e3d45490d7586b7ed2e40c13f1
  F ext/fts5/fts5_vocab.c 3742d0abfe8aa8c3cb4a7df56aa38f2e3c3fb1c2
@@@ -1408,7 -1406,7 +1409,7 @@@ F tool/vdbe_profile.tcl 246d0da094856d7
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P a4e55f73b3c81e28b917395089c0201f9a2c9178
- R 0d0b45c96327e08ac49c0cd0bf01187b
 -P fd0a50f0797d154fefff724624f00548b5320566
 -R 87a59d21671d8eb854da54e44c1cb06d
 -U drh
 -Z 6b66decd394482c2ac340e90e8473c2f
++P 8d05cfd48db1462dfd3efd502d53bd33214403fb 55a11fd627eaf046b3783622b2925399a50a65b4
++R cf1317de6526e81224b7c381ca0d373b
 +U dan
- Z 1ffb33ee956b9f5de9322a26ad6982ed
++Z 2530c4785808f691eed775076fac89d0

diff --cc manifest.uuid
index 1b603ff0f2645a425bfd3be42c611da5555d562b,6cc99548700a8fe1b005267ae6d5f06dcb7188da..d32e744eb2874e41f187639dda1ddaece60b3e2a
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 8d05cfd48db1462dfd3efd502d53bd33214403fb
 -55a11fd627eaf046b3783622b2925399a50a65b4
++e7dcd013516723941c2fb78ecdc96806d49d310b