Merge trunk changes, including fixes for compiler warnings in fts5 code, with this...

FossilOrigin-Name: 7190d79ba452ceb1af77ce1375278b097816a8be

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

diff --cc manifest
index 4cdbff045d18b33143c752f9cdd728fd6a136312,6a62491cb794f8a6cbf2eef48f6799eafd255ed6..0430c68b87410dcbacd228db1f6a89a31a30a109
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Use\sa\sWITHOUT\sROWID\stable\sto\sindex\sfts5\sbtree\sleaves.\sThis\sis\sfaster\sto\squery\sand\sonly\sslightly\slarger\sthan\sstoring\sbtree\snodes\swithin\san\sintkey\stable.
- D 2015-07-15T19:46:02.242
 -C Fix\scompiler\swarnings\sin\sfts5\scode.
 -D 2015-07-16T20:17:57.553
++C Merge\strunk\schanges,\sincluding\sfixes\sfor\scompiler\swarnings\sin\sfts5\scode,\swith\sthis\sbranch.
++D 2015-07-16T20:24:42.461
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 6e8af213d49e6325bf283ebed7662254f8e15bda
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -109,12 -109,12 +109,12 @@@ F ext/fts5/fts5.h 81d1a92fc2b4bd477af7e
  F ext/fts5/fts5Int.h 8d9bce1847a10df2e4ed9492ea4f3868276748fb
  F ext/fts5/fts5_aux.c 044cb176a815f4388308738437f6e130aa384fb0
  F ext/fts5/fts5_buffer.c 80f9ba4431848cb857e3d2158f5280093dcd8015
 -F ext/fts5/fts5_config.c b2456e9625bca41c51d54c363e369c6356895c90
 +F ext/fts5/fts5_config.c fdfa63ae8e527ecfaa50f94063c610429cc887cf
- F ext/fts5/fts5_expr.c d2e148345639c5a5583e0daa39a639bf298ae6a7
- F ext/fts5/fts5_hash.c 219f4edd72e5cf95b19c33f1058809a18fad5229
- F ext/fts5/fts5_index.c 7fe8e8afdb872b55726263b2a82288ebabda969c
- F ext/fts5/fts5_main.c 8f279999deb204b0c7760464f60f88666046398b
+ F ext/fts5/fts5_expr.c ac0614f843cf5c80a85c4c6aa44bbede62a51bb2
+ F ext/fts5/fts5_hash.c ff07722c73587c12781213133edbdb22cd156378
 -F ext/fts5/fts5_index.c d6ad9293280f39c56343ef5035b0475ff2a6be12
++F ext/fts5/fts5_index.c 60c688801ce59f421c6073da047a3ebc0b3ec079
+ F ext/fts5/fts5_main.c 0de7ba81488d2c502c8e794eaf7983d468e4c6e9
 -F ext/fts5/fts5_storage.c 1c35a38a564ee9cadcbd7ae0b13a806bdda722bd
 +F ext/fts5/fts5_storage.c 877399c557f273a725b5e4fc26f07e67ca90570a
  F ext/fts5/fts5_tcl.c 85eb4e0d0fefa9420b78151496ad4599a1783e20
  F ext/fts5/fts5_tokenize.c 30f97a8c74683797b4cd233790444fbefb3b0708
  F ext/fts5/fts5_unicode2.c 78273fbd588d1d9bd0a7e4e0ccc9207348bae33c
@@@ -1365,10 -1365,7 +1365,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 110cd84f5e842c4dcd9b9398cea211e25f36b3aa
- R 6be01aa6bafcfd1604a2d6d0b1df9b9e
- T *branch * fts5-btree-index
- T *sym-fts5-btree-index *
- T -sym-trunk *
 -P 9a592cf91c74b369bacf6a0e69d45f3e73dfdbce
 -R 7a5b6f6204af419d579789c3ece1729c
++P 862418e3506d4b7cca9c44d58c2eb9dc915d75c9 e9bf275cd969eca6fb41384d3637528d6a19f819
++R 13b93e3f59e7dab4e2705105f60947d5
  U dan
- Z 0f1494b26034248995977524e0d0424a
 -Z a4633be21e523e4e841d0095eaa70845
++Z 0c71c25a3e3a21d59d6227b0b3745fb8

diff --cc manifest.uuid
index 856beb149f2d1031fa3333c7d8cf33ea30328e65,dbc4f5f578142dba1344bc34a9b5b0e7ce23569c..d8592d7e894cd80d7c118a92af83345bcc09eead
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 862418e3506d4b7cca9c44d58c2eb9dc915d75c9
 -e9bf275cd969eca6fb41384d3637528d6a19f819
++7190d79ba452ceb1af77ce1375278b097816a8be