From: dan <dan@noemail.net>
Date: Mon, 17 Dec 2018 15:22:44 +0000 (+0000)
Subject: Merge changes from wal2 branch.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ac9aaf3fc6ed740cedf058e21c2f5bd2ebad973;p=thirdparty%2Fsqlite.git

Merge changes from wal2 branch.

FossilOrigin-Name: 85f49f0d7344611ac4157421273660c648f73ca62afa4faa8707475f21c67f7a
---

1ac9aaf3fc6ed740cedf058e21c2f5bd2ebad973
diff --cc manifest
index 9f8621e6c9,6011543e8e..3028d27aa3
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\slatest\swal2\schanges\sinto\sthis\sbranch.
- D 2018-12-15T20:59:14.337
 -C Add\sextra\stest\scase\sto\swal2recover.test.
 -D 2018-12-17T15:22:24.652
++C Merge\schanges\sfrom\swal2\sbranch.
++D 2018-12-17T15:22:44.431
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F Makefile.in 68d0ba0f0b533d5bc84c78c13a6ce84ee81183a67014caa47a969e67f028fa1c
@@@ -1608,11 -1595,10 +1608,11 @@@ F test/vtab_alter.test 736e66fb5ec7b4fe
  F test/vtab_err.test dcc8b7b9cb67522b3fe7a272c73856829dae4ab7fdb30399aea1b6981bda2b65
  F test/vtab_shared.test 5253bff2355a9a3f014c15337da7e177ab0ef8ad
  F test/wal.test 613efec03e517e1775d86b993a54877d2e29a477
 -F test/wal2.test 155b9efa999bdb38ce1cd729b9a4fcdbffd6b88be27f039bad1d2929d287d918
 +F test/wal2.test a225bafac35a47765b890bacdeb57e5e81039f21cc18a1e8ce88eb76e56b843c
  F test/wal2big.test 0b4ec526f9ca4bbabc355042c38045ae2e253fb46eb327bb7693d0122bc6968b
 +F test/wal2concurrent.test abb4c9d77e4cbd444aa95064f028805c2273c68440e45790b9da03f763fcad71
  F test/wal2lock.test 0ef98d72dc6bcf7711dedd684760488400d9a9a6eec0dc5d3822060437793552
- F test/wal2recover.test da390d40c955a74b8a049d41248f92f928a5a5ee6bbcca33cb665c95b736c11c
+ F test/wal2recover.test ba8f4bc9397c838734619f9e759bd98b00e355347b3cf80a2e677610d231d5d8
  F test/wal2recover2.test 98749381c2e61574e181a2e288295a3bf93d12f57769db50ecea7fc211d9ad5c
  F test/wal2rewrite.test 6ca6f631ffcf871240beab5f02608913fd075c6d0d31310b026c8383c65c9f9c
  F test/wal2savepoint.test 29725383e7eb8b78fed46333d69dc45b4ed321db43ecc81766aadea991874bef
@@@ -1808,7 -1792,7 +1808,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 7bd3b35661d7d0e51113b9e4b15a0ab7f8e26edeafb43941ef5b44bb94df5109 9cb5f8dab685f5ea36ad142cfa588dee82e87f3a89e8dcf84e0ee124bb29bc7f
- R 815495c7243c42d7961c3747dfcd1f83
 -P 9cb5f8dab685f5ea36ad142cfa588dee82e87f3a89e8dcf84e0ee124bb29bc7f
 -R 126e20a307613344c2c21be5333f4cc9
++P 06bb80eeb84f57b1e8109a35f5b14992a2e23f2bf5a8921fa29087f96cb44d10 1a5aa73435b11fff0567672dc921d34aad57adf0381ad430e1389f39a6f025b7
++R 8e68c96578902ed8366e0be2c5f6b217
  U dan
- Z c5f1a6f538d64ad58200a0eba1330648
 -Z 0b7e3c508818c5bb27b7cd0635e26287
++Z f14c191dc1b8f86bc4800ff2a6c15331
diff --cc manifest.uuid
index e5f5fbac0d,61b581122e..27d6d7ae9e
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 06bb80eeb84f57b1e8109a35f5b14992a2e23f2bf5a8921fa29087f96cb44d10
 -1a5aa73435b11fff0567672dc921d34aad57adf0381ad430e1389f39a6f025b7
++85f49f0d7344611ac4157421273660c648f73ca62afa4faa8707475f21c67f7a