From: dan <dan@noemail.net>
Date: Mon, 23 Oct 2017 20:20:42 +0000 (+0000)
Subject: Merge trunk fixes to swarmvtabfault.test and the lsm extension into this
X-Git-Tag: version-3.21.0~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=685bea66ce7fc38e4cbc5369a39af5d895e19dc9;p=thirdparty%2Fsqlite.git

Merge trunk fixes to swarmvtabfault.test and the lsm extension into this
branch. No changes to core SQLite code.

FossilOrigin-Name: f632b87002a7ee9be569aacb5ce85bb7e9c86b7d77bb8d1bf8b55eb5be4ecc77
---

685bea66ce7fc38e4cbc5369a39af5d895e19dc9
diff --cc manifest
index 4bf6a1d006,2cb9e12473..2399bd7eea
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Updates\sto\stest\sprocedures\sso\sthat\sthey\sall\swork\swith\sencryption.\s\sNo\schanges\nto\sthe\score\sSQLite\scode.
- D 2017-10-23T16:34:07.586
 -C In\sthe\s'swarmvtabfault'\stest\smodule,\smake\ssure\sto\sclose\sthe\sdatabase\shandle\sprior\sto\sraising\san\serror\sfrom\sthe\s'not\sfound'\scallback\sscript.
 -D 2017-10-23T20:17:19.102
++C Merge\strunk\sfixes\sto\sswarmvtabfault.test\sand\sthe\slsm\sextension\sinto\sthis\nbranch.\sNo\schanges\sto\score\sSQLite\scode.
++D 2017-10-23T20:20:42.832
  F Makefile.in e016061b23e60ac9ec27c65cb577292b6bde0307ca55abd874ab3487b3b1beb2
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc 37740aba9c4bb359c627eadccf1cfd7be4f5f847078723777ea7763969e533b1
@@@ -1249,9 -1249,9 +1249,9 @@@ F test/subselect.test 0966aa8e720224dbd
  F test/substr.test 18f57c4ca8a598805c4d64e304c418734d843c1a
  F test/subtype1.test 7fe09496352f97053af1437150751be2d0a0cae8
  F test/superlock.test ec94f0556b6488d97f71c79f9061ae08d9ab8f12
 -F test/swarmvtab.test 05c4ca7b6ab0cc6f4c335a510347f99d741fa71366004699cf7dfa3cff4e2d17
 -F test/swarmvtab2.test 038ef9bcad6fd2fb9e395196080cf23e223ddb1219015049a61540c161bc577d
 +F test/swarmvtab.test c2279311b44de032f86a8295a9b06818d864856f9428b4c99eee91a0d419cf25
 +F test/swarmvtab2.test 9a3a68a1e58d00f4ed6c68d12d52f2df971b9e22a80a41f6f8c1409abba8e5b4
- F test/swarmvtabfault.test 73563eefe3073c6fb3bb14475fb4ef5d4f2e3a67a02947ee0ca08980ea3dd7fe
+ F test/swarmvtabfault.test 00aec54665909490f5c383f3cae3b5d18bd97c12490b429ff8752a3027acfa42
  F test/symlink.test c9ebe7330d228249e447038276bfc8a7b22f4849
  F test/sync.test 2f84bdbc2b2df1fcb0220575b4b9f8cea94b7529
  F test/sync2.test 6be8ed007fa063b147773c1982b5bdba97a32badc536bdc6077eff5cf8710ece
@@@ -1664,7 -1664,7 +1664,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 58e5bb491bc0e28412ca188ba8fbe94adc67b5b1e9d7c112c36011400528d577
- R a447261df1989a937247d3824cdf45d6
- U drh
- Z c50c87663ba16acea2ad67bd15f69a8a
 -P e1bf5e1d06dbe573671c6b5472b45f5bfa3cf82374f70a76b4c80815bf15a29b
 -R c767dcd50a85f97407be83eb8fcdc039
 -U mistachkin
 -Z 6d76c482979023bebbeef80b070aef99
++P 0481330756e861de8e1eb7136e7dca2f333b2a82377949d2e0eba401af7d73dd f317037b31b19007e30bb41c54506d9d241a6d590c2b31e2ddda10d4f6e7605b
++R ddc3003da6d6bb8e92c74828b5fa4343
++U dan
++Z d8722be9be441804446b8c51f09c2f27
diff --cc manifest.uuid
index 3a2fc73c3f,0c9cd50350..1fd8f6b26b
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 0481330756e861de8e1eb7136e7dca2f333b2a82377949d2e0eba401af7d73dd
 -f317037b31b19007e30bb41c54506d9d241a6d590c2b31e2ddda10d4f6e7605b
++f632b87002a7ee9be569aacb5ce85bb7e9c86b7d77bb8d1bf8b55eb5be4ecc77