From: dan <dan@noemail.net>
Date: Thu, 8 Jun 2017 16:10:41 +0000 (+0000)
Subject: Merge 3.19.3 changes with this branch.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=63624a0ab8501573f1e509dd8d0e06361a2ee0a9;p=thirdparty%2Fsqlite.git

Merge 3.19.3 changes with this branch.

FossilOrigin-Name: e2d38d51a9cf1c3dfef742507ec76e3d35853bd09b0d09bf2d404c4b036a184d
---

63624a0ab8501573f1e509dd8d0e06361a2ee0a9
diff --cc manifest
index fa75427307,5b7be2b7f8..f9144add04
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\schanges\sfor\sversion\s3.19.0\swith\sthis\sbranch.
- D 2017-06-08T15:54:02.114
 -C Version\s3.19.3
 -D 2017-06-08T14:26:16.283
++C Merge\s3.19.3\schanges\swith\sthis\sbranch.
++D 2017-06-08T16:10:41.913
  F Makefile.in 1cc758ce3374a32425e4d130c2fe7b026b20de5b8843243de75f087c0a2661fb
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc 8eeb80162074004e906b53d7340a12a14c471a83743aab975947e95ce061efcc
@@@ -348,12 -344,12 +348,12 @@@ F src/analyze.c 0d0ccf7520a201d8747ea2f
  F src/attach.c 8c476f8bd5d2afe11d925f890d30e527e5b0ce43
  F src/auth.c 79f96c6f33bf0e5da8d1c282cee5ebb1852bb8a6ccca3e485d7c459b035d9c3c
  F src/backup.c faf17e60b43233c214aae6a8179d24503a61e83b
 -F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
 +F src/bitvec.c c77b7f5759e413c1c8b53267d633c952e66db79c1171964c7e24c0f92f5019cf
  F src/btmutex.c 0e9ce2d56159b89b9bc8e197e023ee11e39ff8ca
- F src/btree.c 63ae7953340839b84a1462f01414debebf8a178867085189280698f0cf724219
 -F src/btree.c de57bf3f205082eb4ad8c923af7ecd1d10c4f15656f6a38038a3bd9b8ac3fc2a
 -F src/btree.h 80f518c0788be6cec8d9f8e13bd8e380df299d2b5e4ac340dc887b0642647cfc
 -F src/btreeInt.h a392d353104b4add58b4a59cb185f5d5693dde832c565b77d8d4c343ed98f610
 -F src/build.c 4026a9c554b233e50c5e9ad46963e676cf54dd2306d952aa1eaa07a1bc9ce14f
++F src/btree.c 95dd5106cb3ee133610b8fab3d1ab1d76ae7f9ef3fae11d023836dc3c672d2b7
 +F src/btree.h 14e99cc2b666beb60322173c761d16b668ec2e07c18bbb74e8a49fe85946f8a0
 +F src/btreeInt.h 7429915fc8f51bbd78b7ac023aa4afbe5b9660fc1e6970f144b07540a34a4623
 +F src/build.c ba3f389668754c407805bbc5f8ab140f063ba6b04a6a86f63006b63b3c7319a8
  F src/callback.c 2e76147783386374bf01b227f752c81ec872d730
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/ctime.c 47d91a25ad8f199a71a5b1b7b169d6dd0d6e98c5719eca801568798743d1161c
@@@ -372,7 -368,7 +372,7 @@@ F src/in-operator.md 10cd8f4bcd225a3251
  F src/insert.c d4bb3a135948553d18cf992f76f7ed7b18aa0327f250607b5a6671e55d9947d5
  F src/legacy.c e88ed13c2d531decde75d42c2e35623fb9ce3cb0
  F src/loadext.c a72909474dadce771d3669bf84bf689424f6f87d471fee898589c3ef9b2acfd9
- F src/main.c 5559b8e5aa6a7222d3dff52ae377b48e4365a7a4e3ea21491fc6c508a1fb838a
 -F src/main.c a56577fa6407fb49650c1fd27bf828cd9b55126716b1f766a03c9c2cb42b43a0
++F src/main.c 2ff34ece3b1b282ecbfb5c0870a4ba8fff6e8a5699189c20cc6aaa4bfe752862
  F src/malloc.c e20bb2b48abec52d3faf01cce12e8b4f95973755fafec98d45162dfdab111978
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
@@@ -407,12 -403,12 +407,12 @@@ F src/printf.c 8757834f1b54dae512fb25eb
  F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
  F src/resolve.c 3e518b962d932a997fae373366880fc028c75706
  F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
- F src/select.c d74b1cde1d9ca6d08bec50b60a5be19440273646bc8ae16648d748c38161d5b7
+ F src/select.c c444ca057d48cf1a4eb8f6a58fbc13418a7f83ae94a6bd6f29f7ad6c704a9e4c
  F src/shell.c a37d96b20b3644d0eb905df5aa7a0fcf9f6e73c15898337230c760a24a8df794
 -F src/sqlite.h.in 8dd468837a4f6d76713e3a4cc65bea48095009038593d41040ab46c1b351197f
 +F src/sqlite.h.in 6eae6c87571d142f5aee27d49b13b5aec06bae40c706494e8565a64ab68b03f5
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 58fd0676d3111d02e62e5a35992a7d3da5d3f88753acc174f2d37b774fbbdd28
 -F src/sqliteInt.h aea3aa1b81e0d07d5b1c39b8c5a54a1dc5e4f10136cb63da392aef9eb2a5108b
 +F src/sqliteInt.h b7e590bc90ebee66cf79fb41312a7cdbce881b7db316d934c159294ff6087fd5
  F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
  F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@@ -473,8 -469,8 +473,8 @@@ F src/trigger.c c9f0810043b265724fdb1bd
  F src/update.c c443935c652af9365e033f756550b5032d02e1b06eb2cb890ed7511ae0c051dc
  F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
  F src/util.c fc081ec6f63448dcd80d3dfad35baecfa104823254a815b081a4d9fe76e1db23
 -F src/vacuum.c 1fe4555cd8c9b263afb85b5b4ee3a4a4181ad569
 -F src/vdbe.c 70f1c27d3de7b3ea68d3ee2b7fbf407335b66f7483eb321201ffe53724f9c54e
 +F src/vacuum.c 8aa1db0b7052269890ac03089ed030eefa88480897915f727703ca74d0676380
- F src/vdbe.c 3cffe0734248764927b3fe6f0343d550bf678612f221daac24da8366a1d5c96d
++F src/vdbe.c aa018a14de2d1ab6ea45c4c14f75ef2a08791b6a7ec68e92895b32cf5aff2ec2
  F src/vdbe.h f7d1456e28875c2dcb964056589b5b7149ab7edf39edeca801596a39bb3d3848
  F src/vdbeInt.h 1ecdacc1322fdd3241ec30c32a480e328a6f864e532dc53fae8e0ab68121aebf
  F src/vdbeapi.c dc904b3c5e459727993c2421e653e29d63223846d129fae98adc782b0a996481
@@@ -1591,7 -1580,10 +1591,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 f131677dcb4937e0dd62626afa91756aa28079e92acd6e9e127f6f676aa334f9 28a94eb282822cad1d1420f2dad6bf65e4b8b9062eda4a0b9ee8270b2c608e40
- R 50aadce44e176f60760b761a01cd33b8
 -P 97b5c4a53d0af3792c5ae5ceafdb02245f841c2bd4d79bcfd0ffdf6c5ff27c9e
 -R b94272eb5bee6b36b4ac20fd561bc415
 -T +bgcolor * #d0c0ff
 -T +sym-release *
 -T +sym-version-3.19.3 *
 -U drh
 -Z 0ee14e0381c757607413d6046358676f
++P 0f59bb94d5e8e16a47c53ef0d6138a35c87230ad384b58008e8e7127780446d8 0ee482a1e0eae22e08edc8978c9733a96603d4509645f348ebf55b579e89636b
++R f7ed8b840e4f80adc0a45856c6802bc0
 +U dan
- Z b31d1e2c7344d42e8096fbb8a9c0e239
++Z 8407296cfc564f67ed28c7f44ba3d184
diff --cc manifest.uuid
index 34ca2f2481,fd64fbcbc1..b3d31c2fb1
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 0f59bb94d5e8e16a47c53ef0d6138a35c87230ad384b58008e8e7127780446d8
 -0ee482a1e0eae22e08edc8978c9733a96603d4509645f348ebf55b579e89636b
++e2d38d51a9cf1c3dfef742507ec76e3d35853bd09b0d09bf2d404c4b036a184d