From: drh <drh@noemail.net>
Date: Mon, 25 May 2020 18:09:15 +0000 (+0000)
Subject: Merge version 3.32.1 into the wal2 branch.
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ea8c9a43aa61fb7b26ddcc977b043ffb9ed87524;p=thirdparty%2Fsqlite.git

Merge version 3.32.1 into the wal2 branch.

FossilOrigin-Name: 5c1837572586902313702c46057ef5dc84030683ff3467c6f3f25903b6ab22d1
---

ea8c9a43aa61fb7b26ddcc977b043ffb9ed87524
diff --cc manifest
index d712daea4b,306c86e783..2fb3ac9712
--- a/manifest
+++ b/manifest
@@@ -1,13 -1,13 +1,13 @@@
- C Merge\sversion\s3.32.0\sinto\sthe\swal2\sbranch.
- D 2020-05-22T18:28:59.454
 -C Version\s3.32.1
 -D 2020-05-25T16:19:56.155
++C Merge\sversion\s3.32.1\sinto\sthe\swal2\sbranch.
++D 2020-05-25T18:09:15.979
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
 -F Makefile.in 376f53999defeb32b7ad2626fd58aae8f3694c38ab7ee30c2289e0d0525a9238
 +F Makefile.in 24e217b2b738eab3c0ad8832a04ebad94d56539d764f1021607252ae9af5bd2f
  F Makefile.linux-gcc f609543700659711fbd230eced1f01353117621dccae7b9fb70daa64236c5241
 -F Makefile.msc 8d00aeba2609bb498dded5eead2890126321f02e292573bf29bf2d18487d37bd
 +F Makefile.msc b5415749c997c5a0852c47ea103dc4c060c8052c92f97006c5fec210733eff73
  F README.md 1514a365ffca3c138e00c5cc839906108a01011a6b082bad19b09781e3aa498a
- F VERSION 980d78a2ce04a1fd0ebefbaabd665f7f9186563820629ee29c6e350e96f19b52
+ F VERSION 7d1da8465e06354a9ffb67a9ef3f933552767d8e239b507cb2a08ba417048322
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
  F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
@@@ -528,14 -526,14 +528,14 @@@ F src/parse.y c8eff38606f443d5ba245263f
  F src/pcache.c 385ff064bca69789d199a98e2169445dc16e4291fa807babd61d4890c3b34177
  F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586
  F src/pcache1.c 6596e10baf3d8f84cc1585d226cf1ab26564a5f5caf85a15757a281ff977d51a
 -F src/pragma.c 1b0db48177e52b256c003b8dc6ac708b1079a82cded944a23820574586a4731f
 +F src/pragma.c 6ac2af3f44124d1e42eeee977f1aa979d425226fefb98a34996e122ce95d2bed
  F src/pragma.h 8168e588536bffd95319451f34e9a754dc37d205ebe433031a7813c5b286beae
  F src/prepare.c 8d4d6c8aa6afefc48027c54b41cdf134b4d6bc2fc4badbe483ad7fd9e1728a28
- F src/printf.c ebf563cff3122f6a61149964b738b470196d3619df31d6a720d0ff72fcfd7c7b
+ F src/printf.c 94b5419ad0a17269f76a9e968ca19cf9fa37617abed2e246fc48844e511b6bc6
  F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
- F src/resolve.c d36a2b1639e1c33d7b508abfd3452a63e7fd81737f6f3940bfef085fca6f21f4
+ F src/resolve.c c2008519a0654f1e7490e9281ed0397d0f14bb840d81f0b96946248afcbdb25d
  F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
- F src/select.c ee4b02ad8047c35891b7a612091beec21ae7a0155290dcbefb0824aed20c46f3
+ F src/select.c e2a59548681bf1c407132863ae87bf2444aca5543867c21d9d09aa07f44aef5d
  F src/shell.c.in cf2d24f54412c06e5fb34af7fabc748651125e1dceac29b740e91f06d23447b6
  F src/sqlite.h.in 74342b41e9d68ff9e56b192009046f8dd0aa2bd76ce1a588f330de614ba61de7
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
@@@ -619,9 -617,9 +619,9 @@@ F src/vdbetrace.c fa3bf238002f0bbbdfb66
  F src/vdbevtab.c ee5b4c902fdda2230f9503ac7b84c6d614c91e8f6f4dc1633e2e8dfef8ffb144
  F src/vtab.c 7b452592ed2ee95dedb1f323d557cebede5a6f3b4558b21a5dca527e6ae9b12c
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
- F src/wal.c 942cf950d76a7d38304106055e5e27d77b37cc76f81b602ea09a4d67f6f45ade
 -F src/wal.c 04c3d2a673192016a671eb051a1900945a8c7331f4378636a8bfb70e8e596c84
 -F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
++F src/wal.c 8c571afcfcb80d02a637f7e929bc1bf4f78e99036c5bd01ece7f7bb8bf631a70
 +F src/wal.h d01234e828943e002040c22a7e017642962f9fd9b2dc142fa599769ae4e459e9
- F src/walker.c 7c429c694abd12413a5c17aec9f47cfe9eba6807e6b0a32df883e8e3a14835ed
+ F src/walker.c 3df26a33dc4f54e8771600fb7fdebe1ece0896c2ad68c30ab40b017aa4395049
  F src/where.c 9546c82056e8cdb27291f98cf1adca5d271240b399bb97b32f77fc2bea6146c9
  F src/whereInt.h 6b874aa15f94e43a2cec1080be64d955b04deeafeac90ffb5d6975c0d511be3c
  F src/wherecode.c 7b939de85d65cc4b4bfa197513136b9e0ae03167e3b82842ca5a0ba1055ba65d
@@@ -1878,7 -1866,10 +1878,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 16b1eca922d6e10a0ebce1deb559c6c7dd74f8655e3456bad8384c6f4637e6d6 5998789c9c744bce92e4cff7636bba800a75574243d6977e1fc8281e360f8d5a
- R 32296d1150198735579e4176a9dcfa34
 -P b1b182be2ab34cec1d94c5570bc361331a34f727eb9fa4aadfabb7f1ef79f83e
 -R 060d4022d9a6a2267bacd2bd89abcc90
 -T +bgcolor * #d0c0ff
 -T +sym-release *
 -T +sym-version-3.32.1 *
++P 1cb46a7431797978a37e1c6ed77f6473eb44f13d15cd37267d4f9555ac825f53 0c1fcf4711a2e66c813aed38cf41cd3e2123ee8eb6db98118086764c4ba83350
++R 397e9c65efb39a63d73547558a09a47a
  U drh
- Z fe31575cc7d5638205afb058dad1ad1c
 -Z 2dade396208e30c3681b79baa530525b
++Z 113b01d29e0b233c13d4d71077708eaf
diff --cc manifest.uuid
index 391724f9e3,93007e9da7..1ba17f268c
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 1cb46a7431797978a37e1c6ed77f6473eb44f13d15cd37267d4f9555ac825f53
 -0c1fcf4711a2e66c813aed38cf41cd3e2123ee8eb6db98118086764c4ba83350
++5c1837572586902313702c46057ef5dc84030683ff3467c6f3f25903b6ab22d1
diff --cc src/wal.c
index f4cf443e55,52087e1296..9cd8725cb2
--- a/src/wal.c
+++ b/src/wal.c
@@@ -3485,10 -2854,7 +3489,8 @@@ int sqlite3WalBeginReadTransaction(Wal 
    assert( pWal->ckptLock==0 );
  
  #ifdef SQLITE_ENABLE_SNAPSHOT
-   int bChanged = 0;
-   WalIndexHdr *pSnapshot = pWal->pSnapshot;
    if( pSnapshot ){
 +    if( isWalMode2(pWal) ) return SQLITE_ERROR;
      if( memcmp(pSnapshot, &pWal->hdr, sizeof(WalIndexHdr))!=0 ){
        bChanged = 1;
      }