From: drh Date: Mon, 22 May 2017 14:04:46 +0000 (+0000) Subject: Merge the last-minute 3.19.0 changes into trunk. X-Git-Tag: version-3.20.0~258 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d75872244953f9537e96aed86b5de41e30961246;p=thirdparty%2Fsqlite.git Merge the last-minute 3.19.0 changes into trunk. FossilOrigin-Name: e6ba2a93a8d28074ff134dd43c142315de291b7c0a38ecc692863c33975c71c7 --- d75872244953f9537e96aed86b5de41e30961246 diff --cc manifest index 92685f234d,6b3f641961..ad164f97de --- a/manifest +++ b/manifest @@@ -1,5 -1,5 +1,5 @@@ - C Fix\sa\scase\swhere\sNULL\swas\sbeing\spassed\sto\smemcmp()\sfollowing\san\sOOM.\sThis\sis\nprobably\snot\sa\sreal\sproblem,\sas\sthe\snumber-of-bytes\sparameter\swas\spassed\s0\sin\nthis\scase,\sbut\sit\swas\scausing\sa\ssantizer\scomplaint. - D 2017-05-22T08:04:09.852 -C Version\s3.19.0 -D 2017-05-22T13:58:13.592 ++C Merge\sthe\slast-minute\s3.19.0\schanges\sinto\strunk. ++D 2017-05-22T14:04:46.558 F Makefile.in 1cc758ce3374a32425e4d130c2fe7b026b20de5b8843243de75f087c0a2661fb F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc 8eeb80162074004e906b53d7340a12a14c471a83743aab975947e95ce061efcc @@@ -1580,7 -1580,10 +1580,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 f261678c90297f9767040c577796cc1d4db598aa44b0de6906cb73eaef377dee - R 9c5cd56496494be910f3f7b6c2685d76 - U dan - Z a536e53cbd4c63e2c43903846b97b2ce -P 3dd6fe53c7ae6ebe2393e956d040e00b8cd0589674d20aafe1585aaa61325bbe -R 70185df2307fdc4359181caa65daa887 -T +bgcolor * #d0c0ff -T +sym-release * -T +sym-version-3.19.0 * ++P 3ea2bad27e516d5dbfa4a9cb0c767d6a8387280a7e4bbf2ae80cd318da670d66 28a94eb282822cad1d1420f2dad6bf65e4b8b9062eda4a0b9ee8270b2c608e40 ++R 90ec8646e73ec3e9ecc2455d88e4e989 + U drh -Z b6ab1af5186519250316abf46ab3c207 ++Z 3ef537308bdc2960e22b64d20abff8ad diff --cc manifest.uuid index 4fb7099e30,a38c601c9b..9d0d6418ab --- a/manifest.uuid +++ b/manifest.uuid @@@ -1,1 -1,1 +1,1 @@@ - 3ea2bad27e516d5dbfa4a9cb0c767d6a8387280a7e4bbf2ae80cd318da670d66 -28a94eb282822cad1d1420f2dad6bf65e4b8b9062eda4a0b9ee8270b2c608e40 ++e6ba2a93a8d28074ff134dd43c142315de291b7c0a38ecc692863c33975c71c7