From: dan <dan@noemail.net>
Date: Thu, 8 Jun 2017 15:54:02 +0000 (+0000)
Subject: Merge changes for version 3.19.0 with this branch.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dc1bf28ad48e9333762da18c2d5ce4dc997bcb80;p=thirdparty%2Fsqlite.git

Merge changes for version 3.19.0 with this branch.

FossilOrigin-Name: 0f59bb94d5e8e16a47c53ef0d6138a35c87230ad384b58008e8e7127780446d8
---

dc1bf28ad48e9333762da18c2d5ce4dc997bcb80
diff --cc manifest
index 7622016606,6b3f641961..fa75427307
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Extend\seven\sfurther\sthe\slogging\sdesigned\sto\sfind\sproblems\sin\sthe\spointer-map\nstructure.\sCall\sabort()\sto\sdump\sa\score\sas\ssoon\sas\ssuch\sa\sproblem\sis\sseen.
- D 2017-06-02T09:31:27.185
 -C Version\s3.19.0
 -D 2017-05-22T13:58:13.592
++C Merge\schanges\sfor\sversion\s3.19.0\swith\sthis\sbranch.
++D 2017-06-08T15:54:02.114
  F Makefile.in 1cc758ce3374a32425e4d130c2fe7b026b20de5b8843243de75f087c0a2661fb
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc 8eeb80162074004e906b53d7340a12a14c471a83743aab975947e95ce061efcc
@@@ -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 b24b9806db72ad02ca82263b4705150fe9a547508948ee9906b7e120d3710211
 +F src/vacuum.c 8aa1db0b7052269890ac03089ed030eefa88480897915f727703ca74d0676380
- F src/vdbe.c bf4d2b2953c50e8432a7c544a835cd74a358465072e130f3b8e6ef6657759244
++F src/vdbe.c 3cffe0734248764927b3fe6f0343d550bf678612f221daac24da8366a1d5c96d
  F src/vdbe.h f7d1456e28875c2dcb964056589b5b7149ab7edf39edeca801596a39bb3d3848
  F src/vdbeInt.h 1ecdacc1322fdd3241ec30c32a480e328a6f864e532dc53fae8e0ab68121aebf
  F src/vdbeapi.c dc904b3c5e459727993c2421e653e29d63223846d129fae98adc782b0a996481
@@@ -1523,8 -1512,8 +1523,8 @@@ F tool/libvers.c caafc3b689638a1d88d44b
  F tool/loadfts.c c3c64e4d5e90e8ba41159232c2189dba4be7b862
  F tool/logest.c 11346aa019e2e77a00902aa7d0cabd27bd2e8cca
  F tool/max-limits.c cbb635fbb37ae4d05f240bfb5b5270bb63c54439
- F tool/mkautoconfamal.sh e855df211ecbcc7131dee817110ff386cfb112f7
+ F tool/mkautoconfamal.sh ab527af92dc684028e0d1db3fa6241787fae78987b99e5bbac7eb87e1970b8e5
 -F tool/mkkeywordhash.c f7f3b342211ac6a14258b9726d5b97cf4f548f22
 +F tool/mkkeywordhash.c f5ecfd09b56b8badc644554ed38c86056152b893
  F tool/mkmsvcmin.tcl cbd93f1cfa3a0a9ae56fc958510aa3fc3ac65e29cb111716199e3d0e66eefaa4
  F tool/mkopcodec.tcl d1b6362bd3aa80d5520d4d6f3765badf01f6c43c
  F tool/mkopcodeh.tcl a01d2c1d8a6205b03fc635adf3735b4c523befd3
@@@ -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 f7e3e2bc88f110d9282ce5d2fa58580c585faeb57cb707253f05001e5f4bd91b
- R 0cc4cace2096d9ccd320cd1d9a64685a
 -P 3dd6fe53c7ae6ebe2393e956d040e00b8cd0589674d20aafe1585aaa61325bbe
 -R 70185df2307fdc4359181caa65daa887
 -T +bgcolor * #d0c0ff
 -T +sym-release *
 -T +sym-version-3.19.0 *
 -U drh
 -Z b6ab1af5186519250316abf46ab3c207
++P f131677dcb4937e0dd62626afa91756aa28079e92acd6e9e127f6f676aa334f9 28a94eb282822cad1d1420f2dad6bf65e4b8b9062eda4a0b9ee8270b2c608e40
++R 50aadce44e176f60760b761a01cd33b8
 +U dan
- Z 40b70ad4ffb9dd03aeca52705a79b953
++Z b31d1e2c7344d42e8096fbb8a9c0e239
diff --cc manifest.uuid
index c8b24c331b,a38c601c9b..34ca2f2481
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- f131677dcb4937e0dd62626afa91756aa28079e92acd6e9e127f6f676aa334f9
 -28a94eb282822cad1d1420f2dad6bf65e4b8b9062eda4a0b9ee8270b2c608e40
++0f59bb94d5e8e16a47c53ef0d6138a35c87230ad384b58008e8e7127780446d8