From: dan <dan@noemail.net>
Date: Sat, 23 Jan 2016 16:20:16 +0000 (+0000)
Subject: Merge trunk changes (including fixes for warnings in fts5) with this branch.
X-Git-Tag: version-3.11.0~90^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e17b646fd5be41e075c7c8cd287747327748ec36;p=thirdparty%2Fsqlite.git

Merge trunk changes (including fixes for warnings in fts5) with this branch.

FossilOrigin-Name: ceccc9ad788fb4da9120915741995b9f088f85ff
---

e17b646fd5be41e075c7c8cd287747327748ec36
diff --cc manifest
index 0168850d28,9f8ab447a0..e3a6b78f3f
--- a/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Fix\sa\sproblem\sinvolving\sdetail=col\sand\scolumn\sfilters.
- D 2016-01-23T14:45:36.706
 -C Fix\ssome\ssigned/unsigned\scomparison\scompiler\swarnings\sin\sfts5.
 -D 2016-01-23T15:57:06.186
++C Merge\strunk\schanges\s(including\sfixes\sfor\swarnings\sin\sfts5)\swith\sthis\sbranch.
++D 2016-01-23T16:20:16.389
  F Makefile.in 027c1603f255390c43a426671055a31c0a65fdb4
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc d2b93511a969c0c8fcf52aeb5e426571e8c610d2
+ F Makefile.msc 1708a78eda223b6daa302b140037fcc214a779f9
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION 866588d1edf0ccb5b0d33896974338f97564f719
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -97,13 -97,13 +97,13 @@@ 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 ff9c2782e8ed890b0de2f697a8d63971939e70c7
- F ext/fts5/fts5Int.h f93aed3d05d1b3686c4dccf70544bcfc7aa117f1
 -F ext/fts5/fts5Int.h e4c7ca41a7841f180d78a24850757e0ffcb20f27
++F ext/fts5/fts5Int.h a810589cf2fedd7dcfc9ba7871d2a5a09e850ace
  F ext/fts5/fts5_aux.c 2dafc3aee0c70d643140c77d8d70daffa51a9e9e
- F ext/fts5/fts5_buffer.c 7d3f6f01f8fdc45204e6a33925ef8478a67d28dd
+ F ext/fts5/fts5_buffer.c 0b8e1f84fec3ec01f7e17f8d4f17c46856b31e10
  F ext/fts5/fts5_config.c 0c384ebdd23fd055e2e50a93277b8d59da538238
 -F ext/fts5/fts5_expr.c 4ab4504c54bbe24689c83411d8588f4ec99136e9
 +F ext/fts5/fts5_expr.c 48b9131b74c8d3b8c12ba0f7995e2d60eecce9f2
  F ext/fts5/fts5_hash.c 1b113977296cf4212c6ec667d5e3f2bd18036955
 -F ext/fts5/fts5_index.c 716c301835a122ba36910b4f821c87d26ae9a5d9
 +F ext/fts5/fts5_index.c bd5476edd4d6ef37fc389794a78f47f29f521634
  F ext/fts5/fts5_main.c 833db0a3df10ab26e0221a9baa40cf871c450df3
  F ext/fts5/fts5_storage.c fb2eaec3aa954b680d43096dc539f8270bd6390e
  F ext/fts5/fts5_tcl.c f8731e0508299bd43f1a2eff7dbeaac870768966
@@@ -1419,7 -1419,7 +1419,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 b5a57b812fd6a734cf2a342bf0b730ae18912d73
- R 20bdd3799e5ba562672d44f9df7f8c2a
 -P f0a551edf87ef061deae34d88b02c3b484ae9adc
 -R 962289f1674397e1ac71fafb409f527f
++P 7558a0ad2276e91f2faced8ea405d9fdb4fa0c6e 3be336aa893f9eb0837d7d66c83bab1489792b9a
++R 27b07c29574081bf2a6f1649bb5e2393
  U dan
- Z fc938fd5a5718db0c9c10bacac344b80
 -Z 5f630552e065d9e5a5f7f6919a0222d3
++Z 165b70c16fc218fdaf7b93acd8863bd2
diff --cc manifest.uuid
index 7a9fdf27eb,e3c087f5fd..3e212691ce
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 7558a0ad2276e91f2faced8ea405d9fdb4fa0c6e
 -3be336aa893f9eb0837d7d66c83bab1489792b9a
++ceccc9ad788fb4da9120915741995b9f088f85ff