From: dan <dan@noemail.net>
Date: Fri, 22 Jul 2016 17:58:05 +0000 (+0000)
Subject: Merge latest trunk changes with this branch.
X-Git-Tag: version-3.15.0~110^2~106
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4097d0ca799b94ad70bab459234075f7185d55fd;p=thirdparty%2Fsqlite.git

Merge latest trunk changes with this branch.

FossilOrigin-Name: 60fed5cdd4a44aefa1b4d505adeb7936f2f0b952
---

4097d0ca799b94ad70bab459234075f7185d55fd
diff --cc manifest
index c71b40dd0d,15a467b95d..65a4d1d413
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Modifications\stowards\sbetter\svector\sIN(...)\ssupport\son\sthis\sbranch.\sNot\sactivated\syet.
- D 2016-07-13T19:48:13.115
 -C Fix\sa\sproblem\swith\supper\scase\smodule\snames\sin\sthe\s"sqldiff\s--vtab"\scommand.
 -D 2016-07-22T10:09:26.990
++C Merge\slatest\strunk\schanges\swith\sthis\sbranch.
++D 2016-07-22T17:58:05.771
  F Makefile.in 6c20d44f72d4564f11652b26291a214c8367e5db
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc d66d0395c38571aab3804f8db0fa20707ae4609a
@@@ -381,10 -381,10 +381,10 @@@ F src/pragma.h 64c78a648751b9f4f297276c
  F src/prepare.c 22df6171aec1d86904ed2ad30c2348a5748aa04e
  F src/printf.c a5f0ca08ddede803c241266abb46356ec748ded1
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
 -F src/resolve.c cca3aa77b95706df5d635a2141a4d1de60ae6598
 +F src/resolve.c 9680caadd54772699e5a0a8ebd680e014703e4ee
  F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
 -F src/select.c f3c6e9065fb34f6a23af27ec7f1f717ffbfc2ee4
 +F src/select.c 0115f5d222f5cf9b5511ec4072088417354d738a
- F src/shell.c 14ff7f660530a52b117d110ba3390b7b2eb719b6
+ F src/shell.c a8a9e392a6a2777fabf5feb536931cb190f235e5
  F src/sqlite.h.in b9ba728c1083b7a8ab5f6a628b25cd2a00325fbf
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 2a170163d121095c6ab1ef05ed0413722f391d01
@@@ -1507,7 -1506,7 +1508,7 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 728c5aa436a5f55c86b019c415a2b71d1b0a8fd6
- R 6c0b20cb1573f5c43e78ae5a07a06597
 -P bf98a2de7ed41a8acca89d7369b353f12182cfb4
 -R 21feff5d71e42b08ceb5cf54c6ef8c4f
++P 34e35c71b25b0aa2d8931040feb260a78cc48c49 87e25fc472604b3978811be53991104c665a95e7
++R 2fbaab60c614a16797a19958a11968ca
  U dan
- Z 35590bc4128842477cd3208768d4edc0
 -Z 0597e24d7597ffc51d59928722cf37fa
++Z c65487e55e425163e0e854585a16b213
diff --cc manifest.uuid
index 722c9bb7cc,a48b14490b..9342dcf6ce
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 34e35c71b25b0aa2d8931040feb260a78cc48c49
 -87e25fc472604b3978811be53991104c665a95e7
++60fed5cdd4a44aefa1b4d505adeb7936f2f0b952