From: drh <drh@noemail.net>
Date: Wed, 10 Jul 2019 18:21:47 +0000 (+0000)
Subject: Merge the 3.29.0 changes into the begin-concurrent-pnu branch.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3b5a4942f1171e68281a7e5dbc051aee127b0406;p=thirdparty%2Fsqlite.git

Merge the 3.29.0 changes into the begin-concurrent-pnu branch.

FossilOrigin-Name: c89949ccd102a180bf6254aef825bd0c29494d450a64bd1c3e0d347cb3dfad66
---

3b5a4942f1171e68281a7e5dbc051aee127b0406
diff --cc manifest
index f3ac30f228,fcf4a4f733..9e9c32e818
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\senhancements\sfrom\strunk\sinto\sthe\sbegin-concurrent-pnu\sbranch.
- D 2019-07-08T21:12:38.865
 -C Version\s3.29.0
 -D 2019-07-10T17:32:03.802
++C Merge\sthe\s3.29.0\schanges\sinto\sthe\sbegin-concurrent-pnu\sbranch.
++D 2019-07-10T18:21:47.502
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -603,9 -598,9 +603,9 @@@ F src/vdbe.c 2aa047729dc5293cde1a3f199b
  F src/vdbe.h 712bca562eaed1c25506b9faf9680bdc75fc42e2f4a1cd518d883fa79c7a4237
  F src/vdbeInt.h 3ba14553508d66f58753952d6dd287dce4ec735de02c6440858b4891aed51c17
  F src/vdbeapi.c f9161e5c77f512fbb80091ce8af621d19c9556bda5e734cffaac1198407400da
 -F src/vdbeaux.c 3a803d75875031309204df90977059b12ffb706d16b4baa5e2d99f4353962582
 +F src/vdbeaux.c b5d20a12a5be1eddb9aed37f918af73bd0e7e095d4728e38fd4e871c0e0f8e1a
  F src/vdbeblob.c f5c70f973ea3a9e915d1693278a5f890dc78594300cf4d54e64f2b0917c94191
- F src/vdbemem.c 9ee3c0373bfc05dc8bf5307a4a92be6bea3055928c4846fdced7e708993b2d6d
+ F src/vdbemem.c f6f277d17d50972571d1394535d4c3d156fdea871d8f327f5b9479984054015a
  F src/vdbesort.c 66592d478dbb46f19aed0b42222325eadb84deb40a90eebe25c6e7c1d8468f47
  F src/vdbetrace.c fa3bf238002f0bbbdfb66cc8afb0cea284ff9f148d6439bc1f6f2b4c3b7143f0
  F src/vtab.c 1fa256c6ddad7a81e2a4dc080d015d4b0a7135767717d311298e47f6fca64bb3
@@@ -1845,7 -1831,10 +1845,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 e70878b363db8ed0ed8aa345342a4174d54a8d95330b1bffc2843f0b07332526 36295dcebcb5487f2a462eabb41900ac28b8e839898ef0fae0aa4730bf9b0671
- R 81ca4d59ca09272714e786ec2afdfa8e
 -P 6f328c35947d6b3a0741514757b8944692203e89bdb2e7f9bbce8ad9288be344
 -R 3dc95c8af87e7b557da20a5426ebc03a
 -T +bgcolor * #d0c0ff
 -T +sym-release *
 -T +sym-version-3.29.0 *
++P 05aa93afdbf9ae3569c827b24973b6c0af4c03b5faecb4283ba571f8bc64f0e9 fc82b73eaac8b36950e527f12c4b5dc1e147e6f4ad2217ae43ad82882a88bfa6
++R 1ec5b1a81129f224de1196f3ed57e31b
  U drh
- Z d4293b5a7f94ee40e6139c5cedd5c5d8
 -Z 4d356946c4c6edd871b6d6986b095a05
++Z c70fbb829328fa116a567d345f1bc86d
diff --cc manifest.uuid
index d86f342976,0a078bf4da..8ce0b81bb4
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 05aa93afdbf9ae3569c827b24973b6c0af4c03b5faecb4283ba571f8bc64f0e9
 -fc82b73eaac8b36950e527f12c4b5dc1e147e6f4ad2217ae43ad82882a88bfa6
++c89949ccd102a180bf6254aef825bd0c29494d450a64bd1c3e0d347cb3dfad66