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

Merge the 3.29.0 updates into the begin-concurrent-pnu-wal2 branch.

FossilOrigin-Name: 627b428fc8ca0f233cb3ac82a43fc81a22cf81ea958e6b7f69d93a0e53e05d09
---

69a35f9232fc61156a1b607ca5f341b3d3042171
diff --cc manifest
index 52a5cf7f2d,a5df493560..08b5e53e98
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\senhancments\sfrom\swal2,\swhich\salso\smerges\strunk\senhancements.
- D 2019-07-08T21:25:24.793
 -C Merge\sthe\s3.29.0\srelease\sinto\sthe\swal2\sbranch.
 -D 2019-07-10T18:30:00.047
++C Merge\sthe\s3.29.0\supdates\sinto\sthe\sbegin-concurrent-pnu-wal2\sbranch.
++D 2019-07-10T18:40:29.170
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -605,9 -600,9 +605,9 @@@ F src/vdbe.c 617a6a71fc01961331efd5090b
  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
@@@ -1861,7 -1843,7 +1861,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 3deaa6e23b2e7f90f91f48435a9a7bfa124b488cd8498d57d8c71a9419cee5db dcbcbc2a6905588a63b9c926473a7097ca0a03803c5bd3f416f268ae2aa3dc87
- R d94aee5ca1ffdc720d32a5348a9b9e9c
 -P dcbcbc2a6905588a63b9c926473a7097ca0a03803c5bd3f416f268ae2aa3dc87 fc82b73eaac8b36950e527f12c4b5dc1e147e6f4ad2217ae43ad82882a88bfa6
 -R 6332663817f683e4c08cd247220ba3ef
++P 08dcb4593d32b240b585b3fb72fec835c8ad94d9e9c00253e70bbb1b4fc28c94 8baa402282a231d42f419ac220a32b532766e52180e4a70da874d383d8703121
++R 1c833759d52efbc68620192fe510cb29
  U drh
- Z affbdf2495d04faa69665cbe34293632
 -Z 72e720935156ad62882de5c4182bc62f
++Z 9c95519845bfb8c0f262cf9f03046082
diff --cc manifest.uuid
index 1ed8f90280,ad6dd73dfc..e181a0af7b
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 08dcb4593d32b240b585b3fb72fec835c8ad94d9e9c00253e70bbb1b4fc28c94
 -8baa402282a231d42f419ac220a32b532766e52180e4a70da874d383d8703121
++627b428fc8ca0f233cb3ac82a43fc81a22cf81ea958e6b7f69d93a0e53e05d09