Merge latest trunk changes into this branch.

FossilOrigin-Name: fcd8f7ce601729dc51d880d16b97040c1be16aa2

diff --cc manifest
index 2eaac48d9e8dabd9df024c1df0c0a53740fc9163,f42ebf288a8df907e0ace41bc7e189a4d0699852..42920706b3593586390c397f0225bf0b2299c3f0
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,7 -1,7 +1,7 @@@
- C Add\sa\sscript\sto\scombine\sall\sfts5\scode\sinto\sa\ssingle\sfile\s-\sfts5.c\s-\sthat\scan\sbe\sused\sto\sbuild\san\sSQLite\sloadable\sextension.
- D 2015-06-25T20:10:24.657
 -C Simplifications\sand\sperformance\simprovements\sin\sinsertCell().
 -D 2015-06-25T19:53:48.178
++C Merge\slatest\strunk\schanges\sinto\sthis\sbranch.
++D 2015-06-25T20:16:23.149
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 1063c58075b7400d93326b0eb332b48a54f53025
 +F Makefile.in 4757ec5c89c420d90f18b0afa6e63d7b884c881d
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
  F Makefile.msc b7db9ccbbad1c495b98e5326a06cac03aa206127
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
@@@ -102,84 -102,7 +102,84 @@@ F ext/fts3/mkfts3amal.tcl 252ecb7fe6467
  F ext/fts3/tool/fts3view.c 8e53d0190a7b3443764bbd32ad47be2bd852026d
  F ext/fts3/unicode/CaseFolding.txt 8c678ca52ecc95e16bc7afc2dbf6fc9ffa05db8c
  F ext/fts3/unicode/UnicodeData.txt cd07314edb62d49fde34debdaf92fa2aa69011e7
 -F ext/fts3/unicode/mkunicode.tcl a2567f9d6ad6779879a2e394c120ad8718557e65
 +F ext/fts3/unicode/mkunicode.tcl ed0534dd51efce39878bce33944c6073d37a1e20
 +F ext/fts3/unicode/parseunicode.tcl da577d1384810fb4e2b209bf3313074353193e95
 +F ext/fts5/extract_api_docs.tcl 55a6d648d516f35d9a1e580ac00de27154e1904a
 +F ext/fts5/fts5.h 81d1a92fc2b4bd477af7e4e0b38b456f3e199fba
 +F ext/fts5/fts5Int.h 41e9ed1f073770f660b1b59116357f504a8c5ff1
 +F ext/fts5/fts5_aux.c d53f00f31ad615ca4f139dd8751f9041afa00971
 +F ext/fts5/fts5_buffer.c be0dc80a9406151b350be27c7ec2956722578771
 +F ext/fts5/fts5_config.c c232d181d6324f0ae3a2a31319924473999e5816
 +F ext/fts5/fts5_expr.c 549bda1f7edcf10365fbfbc002bdea1be3c287bb
 +F ext/fts5/fts5_hash.c c1cfdb2cae0fad00b06fae38a40eaf9261563ccc
 +F ext/fts5/fts5_index.c 438b245e9e44be3cfa848c71351a4e769b75876a
- F ext/fts5/fts5_main.c 35e90d3d8fafe4c936f232108e891d5f9a6294ca w ext/fts5/fts5.c
++F ext/fts5/fts5_main.c 35e90d3d8fafe4c936f232108e891d5f9a6294ca
 +F ext/fts5/fts5_storage.c b2fa301fce865d582d367a5e1bb438fe60c03cb5
 +F ext/fts5/fts5_tcl.c 7ea165878e4ae3598e89acd470a0ee1b5a00e33c
 +F ext/fts5/fts5_tokenize.c 97251d68d7a6a9415bde1203f9382864dfc1f989
 +F ext/fts5/fts5_unicode2.c da3cf712f05cd8347c8c5bc00964cc0361c88da9
 +F ext/fts5/fts5_varint.c 366452037bf9a000c351374b489badc1b3541796
 +F ext/fts5/fts5_vocab.c e454fa58c6d591024659a9b61eece0d708e8b575
 +F ext/fts5/fts5parse.y 833db1101b78c0c47686ab1b84918e38c36e9452
 +F ext/fts5/mkportersteps.tcl 5acf962d2e0074f701620bb5308155fa1e4a63ba
 +F ext/fts5/test/fts5_common.tcl 26bab0c0ed684e95cd93c419ed995a3f83f4c258
 +F ext/fts5/test/fts5aa.test 0be21c89fd66b588db355a6398911fd875bdcc6c
 +F ext/fts5/test/fts5ab.test 6fe3a56731d15978afbb74ae51b355fc9310f2ad
 +F ext/fts5/test/fts5ac.test 0990ae7497ebaea2ab5f7fd5caedd93a71a905fc
 +F ext/fts5/test/fts5ad.test 312f3c8ed9592533499c5b94d2059ae6382913a0
 +F ext/fts5/test/fts5ae.test ddc558e3e3b52db0101f7541b2e3849b77052c92
 +F ext/fts5/test/fts5af.test c2501ec2b61d6b179c305f5d2b8782ab3d4f832a
 +F ext/fts5/test/fts5ag.test ec3e119b728196620a31507ef503c455a7a73505
 +F ext/fts5/test/fts5ah.test b9e78fa986a7bd564ebadfb244de02c84d7ac3ae
 +F ext/fts5/test/fts5ai.test f20e53bbf0c55bc596f1fd47f2740dae028b8f37
 +F ext/fts5/test/fts5aj.test 05b569f5c16ea3098fb1984eec5cf50dbdaae5d8
 +F ext/fts5/test/fts5ak.test 7b8c5df96df599293f920b7e5521ebc79f647592
 +F ext/fts5/test/fts5al.test fc60ebeac9d8e366e71309d4c31fa72199d711d7
 +F ext/fts5/test/fts5alter.test 3342e7fd58556d2a7e5299a7d9dec62e358028ed
 +F ext/fts5/test/fts5auto.test caa5bcf917db11944655a2a9bd38c67c520376ca
 +F ext/fts5/test/fts5aux.test e5631607bbc05ac1c38cf7d691000509aca71ef3
 +F ext/fts5/test/fts5auxdata.test c69b86092bf1a157172de5f9169731af3403179b
 +F ext/fts5/test/fts5bigpl.test b1cfd00561350ab04994ba7dd9d48468e5e0ec3b
 +F ext/fts5/test/fts5columnsize.test 771401dd7fc628ecb38316613ed2f3cbe8f2b78a
 +F ext/fts5/test/fts5config.test c9cc535f3b36cde1e5a32bf579f3f5962a9e82b2
 +F ext/fts5/test/fts5content.test e46904decd896e38c848ad4f38fa4e80251a028b
 +F ext/fts5/test/fts5corrupt.test 35bfdbbb3cdcea46ae7385f6432e9b5c574e70a1
 +F ext/fts5/test/fts5corrupt2.test c231f532162de381fa83ec477b51cd8633fd9da7
 +F ext/fts5/test/fts5corrupt3.test da4e2adb2308d8587c2eff31b5aa47447b8a2edb
 +F ext/fts5/test/fts5dlidx.test 070531bd45685e545e3e6021deb543f730a4011b
 +F ext/fts5/test/fts5doclist.test 635b80ac785627841a59c583bac702b55d49fdc5
 +F ext/fts5/test/fts5ea.test 451bb37310ee6df8ef72e4354fda5621b3b51448
 +F ext/fts5/test/fts5eb.test 728a1f23f263548f5c29b29dfb851b5f2dbe723e
 +F ext/fts5/test/fts5fault1.test b42d3296be8a75f557cf2cbce0d8b483fc9db45b
 +F ext/fts5/test/fts5fault2.test 28c36c843bb39ae855ba79827417ecc37f114341
 +F ext/fts5/test/fts5fault3.test d6e9577d4312e331a913c72931bf131704efc8f3
 +F ext/fts5/test/fts5fault4.test 762991d526ee67c2b374351a17248097ea38bee7
 +F ext/fts5/test/fts5fault5.test 54da9fd4c3434a1d4f6abdcb6469299d91cf5875
 +F ext/fts5/test/fts5fault6.test 234dc6355f8d3f8b5be2763f30699d770247c215
 +F ext/fts5/test/fts5full.test 0924bdca5416a242103239ace79c6f5aa34bab8d
 +F ext/fts5/test/fts5hash.test bdba7b591d503005d5a81871ba00a359daa1e969
 +F ext/fts5/test/fts5integrity.test b45f633381a85dc000e41d68c96ab510985ca35e
 +F ext/fts5/test/fts5merge.test 8077454f2975a63f35761f4b8a718b3a808b7c9c
 +F ext/fts5/test/fts5near.test d2e3343e62d438f2efd96ebcd83a0d30a16ea6dc
 +F ext/fts5/test/fts5optimize.test 0028c90a7817d3e576d1148fc8dff17d89054e54
 +F ext/fts5/test/fts5plan.test 7f38179220c9385f88e1470aae6cba134a308b40
 +F ext/fts5/test/fts5porter.test 50322599823cb8080a99f0ec0c39f7d0c12bcb5e
 +F ext/fts5/test/fts5porter2.test c534385e88e685b354c2b2020acc0c4920042c8e
 +F ext/fts5/test/fts5prefix.test 7eba86fc270b110ba2b83ba286a1fd4b3b17955e
 +F ext/fts5/test/fts5rank.test f59a6b20ec8e08cb130d833dcece59cf9cd92890
 +F ext/fts5/test/fts5rebuild.test 77c6613aa048f38b4a12ddfacb2e6e1342e1b066
 +F ext/fts5/test/fts5restart.test cd58a5fb552ac10db549482698e503f82693bcd0
 +F ext/fts5/test/fts5rowid.test ca9d91ccb3a4590fc561b2d7a884361bb21e8df5
 +F ext/fts5/test/fts5tokenizer.test 668747fcb41de6fc7daebc478920b705164fccc1
 +F ext/fts5/test/fts5unicode.test 79b3e34eb29ce4929628aa514a40cb467fdabe4d
 +F ext/fts5/test/fts5unicode2.test ad38982b03dc9213445facb16e99f668a74cc4ba
 +F ext/fts5/test/fts5unicode3.test 273f9086ad33935566bbc0d0c94d0d9687ef686b
 +F ext/fts5/test/fts5unindexed.test f388605341a476b6ab622b4c267cd168f59a5944
 +F ext/fts5/test/fts5version.test dc34a735af6625a1a7a4a916a38d122071343887
 +F ext/fts5/test/fts5vocab.test 389e5fe4928eae5fddcf26bcc5a6890b0791aa75
 +F ext/fts5/tool/loadfts5.tcl 7ef3e62131f0434a78e4f5c5b056b09d221710a8
 +F ext/fts5/tool/mkfts5c.tcl fdb449263837a18d9131bc2f61b256fd77e64361
 +F ext/fts5/tool/showfts5.tcl 921f33b30c3189deefd2b2cc81f951638544aaf1
  F ext/icu/README.txt d9fbbad0c2f647c3fdf715fc9fd64af53aedfc43
  F ext/icu/icu.c b2732aef0b076e4276d9b39b5a33cec7a05e1413
  F ext/icu/sqliteicu.h 728867a802baa5a96de7495e9689a8e01715ef37
@@@ -1364,7 -1286,7 +1364,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 df5ccea80e8f0da83af5e595b539687006085120
- R 274e8476f9e52d5f62a7ac4e2d65cc10
 -P 78da0f69cb3289e332018864004f319f2764a5c8
 -R 0d165d2d8c01ecd2475fdbe233dfe5e0
 -U drh
 -Z 8a4a8bb2d9c667bdbc4293aaa6065234
++P 46e86b0637248fb4d623c97778cc041eabe3636c 7d02e6c992ef92e1f77ebc13889e17c028454b06
++R 86f1f29b38c83a25da1125d5a5eacdb5
 +U dan
- Z 3dd1c662504ec180da9a3ceeda958cfb
++Z c3d1693711def65e5756dddc3dd0ec59

diff --cc manifest.uuid
index 69235e7360ce9d73d118a1d593b397e3c7ca7545,e18ea8d4d08ecc08f8503db3886085dc0c43bbd1..f4c59d2e72c05d7b1eb7753f9ab505b1a8e8b316
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 46e86b0637248fb4d623c97778cc041eabe3636c
 -7d02e6c992ef92e1f77ebc13889e17c028454b06
++fcd8f7ce601729dc51d880d16b97040c1be16aa2