Merge version 3.31.0

FossilOrigin-Name: 3bb267deb150c09bc424320d1de4bbaf519310e0e0c4af6a8ac5b6f8d59170b2

diff --cc manifest
index 9c667d3dd8a6c567c3a91a7011b2a377bf7127e5,2589a4d0cafc6bb9540230a1972e04f8817ae041..10a39b8ff3a5a570e52353fdd0cc746f69baf37f
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\srecent\senhancements\sand\sfixes\sfrom\strunk.
- D 2020-01-15T14:11:34.103
 -C Version\s3.31.0
 -D 2020-01-22T18:38:59.573
++C Merge\sversion\s3.31.0
++D 2020-01-22T21:12:27.343
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -474,10 -472,10 +474,10 @@@ F src/auth.c a3d5bfdba83d25abed1013a8c7
  F src/backup.c f70077d40c08b7787bfe934e4d1da8030cb0cc57d46b345fba2294b7d1be23ab
  F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
  F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
 -F src/btree.c 7af5ff0f88ba856c2681f6eeb457590b24f787e994f18cbdb44c2de2d33f757e
 +F src/btree.c dff80958a9a0e63a0f3d53a2f00765dd14015434a6a19e9b3471fab7a4ecf553
  F src/btree.h 6111552f19ed7a40f029cf4b33badc6fef9880314fffd80a945f0b7f43ab7471
  F src/btreeInt.h 6794084fad08c9750b45145743c0e3e5c27c94dee89f26dd8df7073314934fd2
- F src/build.c bd2f382562b08f14748d54402220be1082c2f8ff8973fad47e45a381c438f9bf
+ F src/build.c 2394d2c853088106dfc1cf485d609f20e6421d7c84892b795824e454f78e50ad
  F src/callback.c c547d00963ae28100117b4fb1f0f32242109b5804374ee3bfe01138a54da7f76
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/ctime.c 1b0724e66f95f33b160b1af85caaf9cceb325d22abf39bd24df4f54a73982251
@@@ -520,13 -518,13 +520,13 @@@ F src/os_setup.h 0dbaea40a7d36bf311613d
  F src/os_unix.c ad7640c04eed946052a3b12856362a773d0a717696707313037186df0e2b59f2
  F src/os_win.c 035a813cbd17f355bdcad7ab894af214a9c13a1db8aeac902365350b98cd45a7
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
- F src/pager.c fda3600e72367db8410f28b64f5d3a64731840c76ebe3f88d795a1e8772c6cfb
 -F src/pager.c 302a18da8b247881808cd65009e1ac7c8b6e5cefb22ed9a1c330ed47b73e94ab
 -F src/pager.h 71fe1d5016ec54d0cc5d344cd474e563450b438c59f535e8c1ec8a13b1373f14
++F src/pager.c 17ea5d09ad4b182e927163337522a1bbbcd89fc0daba0a6cff48134da8bfd8f8
 +F src/pager.h d49d4cb7be2e29ce2c376fe87443b2cbf1d95168ed85a65c39530c817303e246
  F src/parse.y c8d2de64db469fd56e0fa24da46cd8ec8523eb98626567d2708df371b47fdc3f
  F src/pcache.c 385ff064bca69789d199a98e2169445dc16e4291fa807babd61d4890c3b34177
  F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586
  F src/pcache1.c 6596e10baf3d8f84cc1585d226cf1ab26564a5f5caf85a15757a281ff977d51a
- F src/pragma.c 8b6013dbf6932f373998c54f24ff7a6ef05f1d8b775577ffc79630c8516daca5
 -F src/pragma.c 0d49d43b22d66397aa026db505457f6683d8a66cd0a4f9db2e6776156bda716c
++F src/pragma.c ba150ef546292e91c6ea63d87216f6448eb081567a7a808338de99b822082cc3
  F src/pragma.h 9f86a3a3a0099e651189521c8ad03768df598974e7bbdc21c7f9bb6125592fbd
  F src/prepare.c 6049beb71385f017af6fc320d2c75a4e50b75e280c54232442b785fbb83df057
  F src/printf.c 9be6945837c839ba57837b4bc3af349eba630920fa5532aa518816defe42a7d4
@@@ -603,9 -601,9 +603,9 @@@ F src/trigger.c a40d50e88bd3355f1d2a73f
  F src/update.c 9ad19af96aff95dc02a923a99f97c1bc0b909009a29a2914b796f786b9ac0c60
  F src/upsert.c 2920de71b20f04fe25eb00b655d086f0ba60ea133c59d7fa3325c49838818e78
  F src/utf.c 736ff76753236ffbc8b5b939f5e0607f28aeaa7c780b3a56b419228f0a81c87b
- F src/util.c e5f3971160154e5c9b660fd119b02ec4890e87cd18a5bc4d45ee60cddbb9e6a2
+ F src/util.c d035b09df9cecbc0e8f07c34b815acbf0d43c8adc8d2c540e3dc92eecb27855a
  F src/vacuum.c 82dcec9e7b1afa980288718ad11bc499651c722d7b9f32933c4d694d91cb6ebf
- F src/vdbe.c 0fe7bdf9a47a0988a855604cd814de3cb7e4a0df59d042238105faa9068fc15c
 -F src/vdbe.c e3dd230ece613409507523e68436764cc20638bb77ba2f416097de5b37235ce1
++F src/vdbe.c 3c109dd85c8c23ce61ebeff1d423a5353ee2b51e5ae58aa83782a3c45cbd26d9
  F src/vdbe.h defd693289c7bb8d325f109be9490c77138061211a116827da7244b6015a4934
  F src/vdbeInt.h 30d3e8b991547cdf39025e416a0a737b0416d46747af70ae058f60e2e0466fe7
  F src/vdbeapi.c 1252d80c548711e47a6d84dae88ed4e95d3fbb4e7bd0eaa1347299af7efddf02
@@@ -616,11 -614,11 +616,11 @@@ F src/vdbesort.c a3be032cc3fee0e3af3177
  F src/vdbetrace.c fa3bf238002f0bbbdfb66cc8afb0cea284ff9f148d6439bc1f6f2b4c3b7143f0
  F src/vtab.c 7b704a90515a239c6cdba6a66b1bb3a385e62326cceb5ecb05ec7a091d6b8515
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
- F src/wal.c 4485157dfc1379cf6bfd545a011a193ab7e7c5d9737049d62984dbc5d4e6b3f0
 -F src/wal.c dbc77159e6734c2d64343cb8624ad245d89dd79a5010750fce8118b3fa7be2e8
 -F src/wal.h 606292549f5a7be50b6227bd685fa76e3a4affad71bb8ac5ce4cb5c79f6a176a
++F src/wal.c d24d51592c4cb2a9972a1198294f7541ad1bb304f989ceba6702fae6736634d4
 +F src/wal.h d2a69695c84137f76e19a247a342cb02ab0131001b6f58153d94b71195bbd84d
  F src/walker.c a137468bf36c92e64d2275caa80c83902e3a0fc59273591b96c6416d3253d05d
- F src/where.c df2bea0e0122e853d9f1a8ec68920744166d2a524e338eba92e5470538ecd1f9
- F src/whereInt.h e1d1db6bbec0ba4f345acc338f956c8237a6f06413afa68c6414e82fb5b06745
+ F src/where.c 2005d0511e05e5f7b6fb3be514b44f264f23d45f3b0cc5e150c63e3006a003e5
+ F src/whereInt.h 9157228db086f436a574589f8cc5749bd971e94017c552305ad9ec472ed2e098
  F src/wherecode.c ec8870d6fe79668dd12d7edc65ae9771828d6cdfe478348c8abd872a89fdbadd
  F src/whereexpr.c 4b34be1434183e7bb8a05d4bf42bd53ea53021b0b060936fbd12062b4ff6b396
  F src/window.c f8ba2ee12a19b51d3ba42c16277c74185ee9215306bc0d5a03974ade8b5bc98f
@@@ -1280,10 -1278,10 +1280,10 @@@ F test/rowvalue7.test c1cbdbf407029db01
  F test/rowvalue8.test 5900eddad9e2c3c2e26f1a95f74aafc1232ee5e0
  F test/rowvalue9.test d8dd2c6ecac432dadaa79e41dc2434f007be1b6b
  F test/rowvaluefault.test 7cd9ccc6c2fbdd881672984087aad0491bb75504
- F test/rowvaluevtab.test d166df5b666662de1ebf40d6f3849f8a76b34e17183a6cc7f81b420c462ce447
+ F test/rowvaluevtab.test cd9747bb3f308086944c07968f547ad6b05022e698d80b9ffbdfe09ce0b8da6f
  F test/rtree.test 0c8d9dd458d6824e59683c19ab2ffa9ef946f798
  F test/run-wordcount.sh 891e89c4c2d16e629cd45951d4ed899ad12afc09
 -F test/savepoint.test 1f8a6b1aea9a0d05837adc463d4bf47bd9d0f1c842f1c2a9caccd639baf34bf9
 +F test/savepoint.test ea1a6c08454e1a4edd973589bcf1fca83928ed09c48858fde1e8653b6daab278
  F test/savepoint2.test 9b8543940572a2f01a18298c3135ad0c9f4f67d7
  F test/savepoint4.test c8f8159ade6d2acd9128be61e1230f1c1edc6cc0
  F test/savepoint5.test 0735db177e0ebbaedc39812c8d065075d563c4fd
@@@ -1869,7 -1857,10 +1869,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 16e1dced8b56ef422e5b747dd26accba5bf9f2df69b24b10363ef288890e21ee 3d7434a9d85dae9135473d1c58c22ac01a282e654807aa10be9b39f127291594
- R f7f5342b1e9d98d7f957dbfbefcf0bb4
 -P 4daf94d83319231e42243625c804d5db2d14f10fa5ea1a1f358c3603c47b955b
 -R 5a98666c879217368b8f21c26d062d92
 -T +bgcolor * #d0c0ff
 -T +sym-release *
 -T +sym-version-3.31.0 *
++P 35eae71a4dd4bd4e2d4a8f12c5e4a0cdb93dadee353b92e67a70a79b29587984 f6affdd41608946fcfcea914ece149038a8b25a62bbe719ed2561c649b86d824
++R 4a15141ff0638e5a607656fc9903267b
  U drh
- Z 4cfafb5668b639ed08b37e9d8bd3fdf2
 -Z 51c630793e0eec473e1274a795f77643
++Z eb2526bd2be754b1790eaced07d5764f

diff --cc manifest.uuid
index f6132a9bc852b0922bd7084d397f3f1990f3849a,f3f9cddef5034075f295018ee68dfc361744eb35..89f54e62c4af96c21c5ef94c8fb4d118ab779d52
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 35eae71a4dd4bd4e2d4a8f12c5e4a0cdb93dadee353b92e67a70a79b29587984
 -f6affdd41608946fcfcea914ece149038a8b25a62bbe719ed2561c649b86d824
++3bb267deb150c09bc424320d1de4bbaf519310e0e0c4af6a8ac5b6f8d59170b2

diff --cc src/pager.c
Simple merge

diff --cc src/pragma.c
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/wal.c
index 99d8e9993363aeccf1111a5aafc0841bb9e06f47,9873f8bf0a803828459aa117d107fceb9cab8eaa..1b14f4c4bdd7b940acfb256ec4a9a0b749c2ba1c
--- 1/src/wal.c
--- 2/src/wal.c
+++ b/src/wal.c
@@@ -2494,19 -1909,21 +2494,23 @@@ static int walCheckpoint
            i64 szDb = pWal->hdr.nPage*(i64)szPage;
            testcase( IS_BIG_INT(szDb) );
            rc = sqlite3OsTruncate(pWal->pDbFd, szDb);
 -          if( rc==SQLITE_OK ){
 -            rc = sqlite3OsSync(pWal->pDbFd, CKPT_SYNC_FLAGS(sync_flags));
 -          }
          }
+         if( rc==SQLITE_OK ){
+           rc = sqlite3OsFileControl(pWal->pDbFd, SQLITE_FCNTL_CKPT_DONE, 0);
+           if( rc==SQLITE_NOTFOUND ) rc = SQLITE_OK;
+         }
          if( rc==SQLITE_OK ){
 -          pInfo->nBackfill = mxSafeFrame;
 +          rc = sqlite3OsSync(pWal->pDbFd, CKPT_SYNC_FLAGS(sync_flags));
          }
        }
 +      if( rc==SQLITE_OK ){
 +        pInfo->nBackfill = bWal2 ? 1 : mxSafeFrame;
 +      }
  
        /* Release the reader lock held while backfilling */
 -      walUnlockExclusive(pWal, WAL_READ_LOCK(0), 1);
 +      if( bWal2==0 ){
 +        walUnlockExclusive(pWal, WAL_READ_LOCK(0), 1);
 +      }
      }
  
      if( rc==SQLITE_BUSY ){