From: dan <dan@noemail.net>
Date: Tue, 29 Sep 2015 11:59:25 +0000 (+0000)
Subject: Merge latest trunk change into this branch.
X-Git-Tag: version-3.9.0~49^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=91742c45a9645e8b4006396fa939ec0e9278c3ba;p=thirdparty%2Fsqlite.git

Merge latest trunk change into this branch.

FossilOrigin-Name: b519c0d67a8fc39d65c17eccc9300a6187bd5661
---

91742c45a9645e8b4006396fa939ec0e9278c3ba
diff --cc manifest
index 40d38d696c,6bcfc15a78..0e0acb1ea1
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Change\sthe\sname\sof\sthe\snew\ssqlite3_index_info.flags\sfield\sto\s"idxFlags".\sAdd\sdocumentation\sfor\sthe\ssame\sto\ssqlite.h.in.
- D 2015-09-29T11:57:20.011
 -C Extra\sinformation\sprovided\sby\s.wheretrace\son\sinput\sflags\sto\sthe\squery\splanner\nand\son\sthe\sresult\sof\ssqlite3WhereOkOnePass().
 -D 2015-09-28T17:05:22.174
++C Merge\slatest\strunk\schange\sinto\sthis\sbranch.
++D 2015-09-29T11:59:25.306
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 2143eeef6d0cc26006ae5fc4bb242a4a8b973412
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -417,9 -417,9 +417,9 @@@ F src/vxworks.h c18586c8edc1bddbc15c004
  F src/wal.c 18b0ed49830cf04fe2d68224b41838a73ac6cd24
  F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
  F src/walker.c 2e14d17f592d176b6dc879c33fbdec4fbccaa2ba
- F src/where.c 6491ebe811ee698793912f927b0fe3b662687e1b
 -F src/where.c 25d7527226d63176b3cd4880a85119cda9f83844
++F src/where.c b7f928b6b8ce091f385ba5ac2394928608431550
  F src/whereInt.h 7892bb54cf9ca0ae5c7e6094491b94c9286dc647
 -F src/wherecode.c 7660e1ad16817a921b099af553f3e1349352d16f
 +F src/wherecode.c a87238178f8c300fd27afec54326ea8d0a18baa2
  F src/whereexpr.c 2473e4350e30f9b55d1c6a8f66ca23c689f23f1d
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
@@@ -1389,7 -1388,7 +1389,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 820c804468abff692742952de670c5d906a50956
- R 546729b46aaa02f7503bc91f6617e820
 -P 5c14d447055bb337428eb1fe0a2934abee381829
 -R afaa284829583439d3c828667e0babfd
 -U drh
 -Z 4d08d7f777c595957317ee86b8c88bc8
++P f61203bc0fb0b62e12d6270e8d9063e445a5a252 c5566bb39c8d9b58f77380b81a873429575c7d5c
++R bc0d8f7ab7b6ff885dd78977e4d43e2a
 +U dan
- Z 84ab7e4ab7ab149e316240ec34018bc8
++Z 5823814221d6aa9768fead2d22b2e0e9
diff --cc manifest.uuid
index 22a29264dc,544e794a7a..8c0cdf89ec
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- f61203bc0fb0b62e12d6270e8d9063e445a5a252
 -c5566bb39c8d9b58f77380b81a873429575c7d5c
++b519c0d67a8fc39d65c17eccc9300a6187bd5661