Merge all version 3.23.1 changes and enhancements from trunk.

FossilOrigin-Name: e20fcb5159f2a74ea60ac6a0287165d114fc71d7510a6d9068962f239dde619f

diff --cc Makefile.msc
Simple merge

diff --cc manifest
index cc9523817e9f38f189c3a0088b7a523f9c1aab53,550f1d6c682ae6dbad9365c00acceb965bc0386c..b39e6f863750cde21ffb5295c68012ae2e68a2f0
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,12 -1,12 +1,12 @@@
- C Merge\sthe\slatest\senhancements\sfrom\strunk.
- D 2018-03-14T17:17:43.919
 -C Version\s3.23.1
 -D 2018-04-10T17:39:29.721
++C Merge\sall\sversion\s3.23.1\schanges\sand\senhancements\sfrom\strunk.
++D 2018-04-10T18:05:07.783
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 -F Makefile.in 7016fc56c6b9bfe5daac4f34be8be38d8c0b5fab79ccbfb764d3b23bf1c6fff3
 +F Makefile.in 4b625ed4055e4361ebecc3acc31cbfacba524db4baa1f57d7685591b22e679cb
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc 2f7888401687afdd6f8cb571fd7a933e413de64fa9dc80bc05e700d7f7c4eaa8
- F README.md 1d5342ebda97420f114283e604e5fe99b0da939d63b76d492eabbaae23488276
- F VERSION cdf91ac446255ecf3d8f6d8c3ee40d64123235ae5b3cef29d344e61b45ec3759
 -F Makefile.msc bdcad21b027a56a73e54a1121cfb9edd0a35c0abfa53aa12c2f996006ff99960
++F Makefile.msc 901dc0a1dd61f27b43d10912bc963d0959909675f70ab7619764510ef54b3583
+ F README.md 7764d56778d567913ef11c82da9ab94aefa0826f7c243351e4e2d7adaef6f373
+ F VERSION 7169eb6959db9ad1b7004ae3b754ef6e703eb7d8dde3b07d2e63103413eb25fb
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
  F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
@@@ -399,15 -400,13 +400,16 @@@ F ext/session/session_speed_test.c edc1
  F ext/session/sessionat.test efe88965e74ff1bc2af9c310b28358c02d420c1fb2705cc7a28f0c1cc142c3ec
  F ext/session/sessiondiff.test ad13dd65664bae26744e1f18eb3cbd5588349b7e9118851d8f9364248d67bcec
  F ext/session/sessionfault.test da273f2712b6411e85e71465a1733b8501dbf6f7
- F ext/session/sessionfault2.test 04aa0bc9aa70ea43d8de82c4f648db4de1e990b0
+ F ext/session/sessionfault2.test 555a8504de03d59b369ef20209585da5aeb2671dedabc4584e9ffe6269689185
+ F ext/session/sessionrebase.test 4e1bcfd26fd8ed8ac571746f56cceeb45184f4d65490ea0d405227cfc8a9cba8
  F ext/session/sessionstat1.test 41cd97c2e48619a41cdf8ae749e1b25f34719de638689221aa43971be693bf4e
  F ext/session/sessionwor.test 2f3744236dc8b170a695b7d8ddc8c743c7e79fdc
- F ext/session/sqlite3session.c 9edfaaa74977ddecd7bbd94e8f844d9b0f6eec22d1d547e806361670db814c1e
- F ext/session/sqlite3session.h 2e1584b030fbd841cefdce15ba984871978d305f586da2d1972f6e1958fa10b1
- F ext/session/test_session.c eb0bd6c1ea791c1d66ee4ef94c16500dad936386
+ F ext/session/sqlite3session.c 2d29bbd888599b94b2c8b31ff433675e008273a4d225b336508b18e6187fec1d
+ F ext/session/sqlite3session.h c01820d5b6e73e86d88008f4d1c1c7dfb83422963018292b864028a0400ceccf
+ F ext/session/test_session.c dba36c6c0153b22501112d3e8882b5c946cf617c955153b6712bd2f8ba1428c0
 +F ext/sqlrr/README.txt 4239030e73023e72a2e727808cd433577d5bf730
 +F ext/sqlrr/sqlrr.c 8d1e6571cd6a6beabdb5bcdfe3a0e723b914db41
 +F ext/sqlrr/sqlrr.h 09e4f8929ad9bc2638732c0cc0db5eef8c417824
  F ext/userauth/sqlite3userauth.h 7f3ea8c4686db8e40b0a0e7a8e0b00fac13aa7a3
  F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
  F ext/userauth/userauth.c 3410be31283abba70255d71fd24734e017a4497f
@@@ -433,18 -432,18 +435,18 @@@ F src/auth.c 6277d63837357549fe14e72349
  F src/backup.c faf17e60b43233c214aae6a8179d24503a61e83b
  F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
  F src/btmutex.c 0e9ce2d56159b89b9bc8e197e023ee11e39ff8ca
- F src/btree.c cd68bc5a0ce8e6e18f40131f2a5e0e8cf0e9090877c517c593c5d6ed78d0a3e1
 -F src/btree.c 9eb9531c65346bbfccf5325384b7db1849daf4db6601dcfe21ba5c5b20623b64
++F src/btree.c 203c72f7967fcc913a9666f3229e340cac0fbbfa1c3793806dbd14261ecb9428
  F src/btree.h 0866c0a08255142ea0e754aabd211c843cab32045c978a592a43152405ed0c84
  F src/btreeInt.h 620ab4c7235f43572cf3ac2ac8723cbdf68073be4d29da24897c7b77dda5fd96
- F src/build.c 672022c06e1a5c2653f80c77a687de11f7e65ce81d20fe2825aadfa13a875c33
+ F src/build.c 61320fb84034c24313de699f3385c6bfe093c925b4df2931c6eb63d7c94ec62a
  F src/callback.c fe677cb5f5abb02f7a772a62a98c2f516426081df68856e8f2d5f950929b966a
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
- F src/ctime.c ff1be3eed7bdd75aaca61ca8dc848f7c9f850ef2fb9cb56f2734e922a098f9c0
+ F src/ctime.c bd9da3f1ff21b432564a16ef0b154cff03585dc43742842e99c58907c6cb4bef
  F src/date.c ebe1dc7c8a347117bb02570f1a931c62dd78f4a2b1b516f4837d45b7d6426957
  F src/dbpage.c 8db4c97f630e7d83f884ea75caf1ffd0988c160e9d530194d93721c80821e0f6
- F src/dbstat.c 7a4ba8518b6369ef3600c49cf9c918ad979acba610b2aebef1b656d649b96720
+ F src/dbstat.c edabb82611143727511a45ca0859b8cd037851ebe756ae3db289859dd18b6f91
  F src/delete.c 20c8788451dc737a967c87ea53ad43544d617f5b57d32ccce8bd52a0daf9e89b
- F src/expr.c 904f85e5f5fa232488cbb662fcf3306ae203728751468670fb9840a9b1886abc
+ F src/expr.c 6a41ceb27924dcfb6dc910a283ce74e136c9c305aba87a5acbfca32f5c49caa7
  F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
  F src/fkey.c d617daf66b5515e2b42c1405b2b4984c30ca50fb705ab164271a9bf66c69e331
  F src/func.c 94f42cba2cc1c34aeaa441022ba0170ec3fec4bba54db4e0ded085c6dc0fdc51
@@@ -453,10 -452,10 +455,10 @@@ F src/hash.c a12580e143f10301ed5166ea49
  F src/hash.h ab34c5c54a9e9de2e790b24349ba5aab3dbb4fd4
  F src/hwtime.h 747c1bbe9df21a92e9c50f3bbec1de841dc5e5da
  F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
- F src/insert.c 14686083cedc198540b15a79586cdd4be2acf6d5fa97627e355f817ab07e9fee
+ F src/insert.c b9ff71cc2913d1d57698a1e22bf853261a9a642baf62bdf40ddeb3809adb85b5
 -F src/legacy.c 134ab3e3fae00a0f67a5187981d6935b24b337bcf0f4b3e5c9fa5763da95bf4e
 +F src/legacy.c 83f4499122392b1f1527a5180b1e89951bf640611ce98768bde1a9f28f0f7dde
  F src/loadext.c f6e4e416a736369f9e80eba609f0acda97148a8b0453784d670c78d3eed2f302
- F src/main.c 6a659285d6d4d0b35a3a3654aad9707a4d5480e5599c8ca5194fc3ec15359772
 -F src/main.c 1648fc7a9bcfdbfd9a9a04af96ff2796c3164b3f3c7e56ed63a3c51cd11d198d
++F src/main.c 478fd68edaa5cc7ef91eb8e94c07c1ae9c1445838cb12906ccfca6c6f860343d
  F src/malloc.c 07295435093ce354c6d9063ac05a2eeae28bd251d2e63c48b3d67c12c76f7e18
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
@@@ -472,33 -471,32 +474,33 @@@ F src/mutex_noop.c 9d4309c075ba9cc7249e
  F src/mutex_unix.c aaf9ebc3f89df28483c52208497a99a02cc3650011422fc9d4c57e4392f7fe58
  F src/mutex_w32.c 7670d770c94bbfe8289bec9d7f1394c5a00a57c37f892aab6b6612d085255235
  F src/notify.c 9711a7575036f0d3040ba61bc6e217f13a9888e7
- F src/os.c 1975fc1d821a8095c6800072874665413733def2e460896c3e0af6a97d082015
 -F src/os.c 1cb0d1d1b3a4267966dee6e292d2b2cdf88e47c0c59cebff27ecafac052dd165
++F src/os.c c46d15f4cbe775cd9eb703cc3a1d59a1c32f7dd4e79f01e0123dc7daa54b24b8
  F src/os.h 48388821692e87da174ea198bf96b1b2d9d83be5dfc908f673ee21fafbe0d432
  F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
  F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
- F src/os_unix.c 9cd1f99a87b3431e63dc9eec9f58094e7df01ee13972380eb81566aec980ba8b
 -F src/os_unix.c 2b53b0b8ddc580db096252c721729e5f5f2f355b4fc056f8f3fb328aeb3c9e8a
 -F src/os_win.c eb03c6d52f893bcd7fdd4c6006674c13c1b5e49543fec98d605201af2997171c
++F src/os_unix.c 801cc679b77b6d949d2cbd818d2e8fe38be77c2eed28a8cd2800da0f2b939c0c
 +F src/os_win.c 606bb196404afe44f5be7459a3e928347dfd618586abf6e7ff5e7e6bcbac6b83
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
- F src/pager.c 100dda22f47e99e04e4dbf74b484a140e6e231fd7581504c985262c2ab5baa5d
- F src/pager.h e9718b1a8d0af6162d6818774d95e621fec6f706baa38cc562690b3e4ee0dca0
- F src/parse.y 3be4b2b5e33ef7dab3128b765898ee786fc6cd698a7f053f756a68f2f238f0aa
 -F src/pager.c 1bb6a57fa0465296a4d6109a1a64610a0e7adde1f3acf3ef539a9d972908ce8f
 -F src/pager.h c571b064df842ec8f2e90855dead9acf4cbe0d1b2c05afe0ef0d0145f7fd0388
++F src/pager.c a6f2fcf933b872db6c6987a10da651f87c14253fccccc3fa35de2491da9474e3
++F src/pager.h 340c4396d108cf3858ba0f8da46143d8d6fa3af399a7056f4cc2b6ffa39da29b
+ F src/parse.y 22ca6e5bb34bbf94e4f91bb1cae6fefad7c03c2e0f29fe9b14b4192e8421f234
  F src/pcache.c 135ef0bc6fb2e3b7178d49ab5c9176254c8a691832c1bceb1156b2fbdd0869bd
  F src/pcache.h 072f94d29281cffd99e46c1539849f248c4b56ae7684c1f36626797fee375170
 -F src/pcache1.c 716975564c15eb6679e97f734cec1bfd6c16ac3d4010f05f1f8e509fc7d19880
 -F src/pragma.c bea56df3ae0637768c0da4fbbb8f2492f780980d95000034a105ff291bf7ca69
 +F src/pcache1.c 77a8848baa3d396b8f597b2e8ba85d82ba00584e45e1c1c27d413712a1b0d88a
 +F src/pragma.c a2a221f06f27dafdddbc71ef652a7f0079a274c7efb83a821498dadaf70ca1e4
  F src/pragma.h bb83728944b42f6d409c77f5838a8edbdb0fe83046c5496ffc9602b40340a324
- F src/prepare.c 67a2c477a7b5222264eead469af996aa7d07da08aa73c3a11f0de125b4f85e2c
 -F src/prepare.c b086fea6a1952db88beca31fdd621201ee5e4ce3f02905248cc3035a8174aa89
++F src/prepare.c e0a310f9fe8b741f2756daed81b663e2181447103e7b19d6b101f8f70d93182f
  F src/printf.c d3b7844ddeb11fbbdd38dd84d09c9c1ac171d21fb038473c3aa97981201cc660
  F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
  F src/resolve.c 66c73fcb7719b8ff0e841b58338f13604ff3e2b50a723f9b8f383595735262f6
  F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
- F src/select.c f02352ac5cbb6fad3804add825743b924cfb6c742ba2e8666d726828a9985d73
- F src/shell.c.in 9b7e7ac1ccdbc045e285e745ff6d21dbec6ce91330f2bdd5db50d5c39f40679e
- F src/sqlite.h.in efce8c03ae4d03988e27c5242ba326ff1c38c64e6daebbd06b3bd04a137dbe24
+ F src/select.c dfcd77a9bec9d2bcb221ed93c153cb38cc609faa6404e2dc0ae9491aac110112
+ F src/shell.c.in cc960721e56ebc1a78773bb5d2f5608b54275f945cbe49e4afe919d6888062a7
 -F src/sqlite.h.in e0be726ea6e4e6571724d39d242472ecd8bd1ba6f84ade88e1641bde98a6d02b
++F src/sqlite.h.in 290151ca4cb721b878d32f16a87bdbac3ded12bccfc919f83fe7b39ee7ec591b
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 +F src/sqlite3_private.h aee73ebaea1963e528b61408c01ba82f49fdf3dca9cbe940f3b0f3d9cec25942
  F src/sqlite3ext.h 83a3c4ce93d650bedfd1aa558cb85a516bd6d094445ee989740827d0d944368d
- F src/sqliteInt.h 2769d44c1b548ae9647daa1ef716c92bb99fced170717a9eb8e7f849619edb0e
 -F src/sqliteInt.h a4837c57f9a3e2af100bc59f4be60d16b823f18131f8cef6a6685440f775eebd
++F src/sqliteInt.h fd7b5647cf75fd37d23b837e439f6aa3ec494fd834da80d2efb259fa9d9db463
  F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
  F src/status.c 46e7aec11f79dad50965a5ca5fa9de009f7d6bde08be2156f1538a0a296d4d0e
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@@ -562,10 -560,10 +564,10 @@@ F src/update.c 97d4c9514229f540f8c441e1
  F src/utf.c 810fbfebe12359f10bc2a011520a6e10879ab2a163bcb26c74768eab82ea62a5
  F src/util.c d9eb0a6c4aae1b00a7369eadd7ca0bbe946cb4c953b6751aa20d357c2f482157
  F src/vacuum.c 762ee9bbf8733d87d8cd06f58d950e881982e416f8c767334a40ffd341b6bff5
- F src/vdbe.c 13dc41a8ba9cbf0692a57fba48bff6e2c1998e35a7a4bb00e30f8adba2d975b6
 -F src/vdbe.c 066a4e1de2ed83e253adfd2e97a684cf562eaa41d31ee7f3d3e4c8aea4485a55
++F src/vdbe.c 41eafba45e814519b50691c1cff16da2a9ec5ad5e63dccd94e7d55f6b58ce97c
  F src/vdbe.h 134beb7a12a6213c00eba58febaede33447cc4441bc568a0d9c144b33fc3720a
  F src/vdbeInt.h 95f7adfdc5c8f1353321f55a6c5ec00a90877e3b85af5159e393afb41ff54110
 -F src/vdbeapi.c 29d2baf9c1233131ec467d7bed1b7c8a03c27579048d768c4b04acf427838858
 +F src/vdbeapi.c 2a0564779a2de60964e80155702bcc2060b6dde607c7c1b97b94c9db4234c465
  F src/vdbeaux.c 2756ac68ac259c416554100598fc291870063288cd7e1af22847f57b3e130e56
  F src/vdbeblob.c f5c70f973ea3a9e915d1693278a5f890dc78594300cf4d54e64f2b0917c94191
  F src/vdbemem.c 414e28d3a7e2a8bee2bb247de115dcbc68e3cbac284d5862d077002f7a93bce1
@@@ -573,14 -571,14 +575,14 @@@ F src/vdbesort.c 731a09e5cb9e96b70c394c
  F src/vdbetrace.c 48e11ebe040c6b41d146abed2602e3d00d621d7ebe4eb29b0a0f1617fd3c2f6c
  F src/vtab.c 0e4885495172e1bdf54b12cce23b395ac74ef5729031f15e1bc1e3e6b360ed1a
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 -F src/wal.c aa9cffc7a2bad6b826a86c8562dd4978398720ed41cb8ee7aa9d054eb8b456a0
 -F src/wal.h 8de5d2d3de0956d6f6cb48c83a4012d5f227b8fe940f3a349a4b7e85ebcb492a
 +F src/wal.c fe0187275982737e0576ba2572f75d48a4ac70f37911cb68905644e690d884da
 +F src/wal.h bada9007800e82f2765ad9ecd9f96176b45c71db769502e24de49d68c0acef65
  F src/walker.c da987a20d40145c0a03c07d8fefcb2ed363becc7680d0500d9c79915591f5b1f
- F src/where.c 7cae47e813393d70c6d327fdf000fcb30f76b1b0b5a5b52ff6402e0c658de32c
- F src/whereInt.h 82c04c5075308abbac59180c8bad5ecb45b07453981f60a53f3c7dee21e1e971
- F src/wherecode.c e1aaadd8fec650037cfbf27d1b3470338fb3b58fec34d11082df16fe9a08fbd7
+ F src/where.c d6e5f2056e9a60251e79780fc598a5943e88a3c0fa0019d54922e59f99019287
+ F src/whereInt.h 2610cb87dd95509995b63decc674c60f2757697a206cfe0c085ee53d9c43cfff
+ F src/wherecode.c 982b7450c53fb272f61a1d20c93e960260ea4dfe8e2e9bacc190e2a041a1f1a4
  F src/whereexpr.c 53532be687e12f3cd314f1e204cd4fbdac7ad250e918a182b048121e16e828ae
 -F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 +F test/8_3_names.test 05034aadccd2253ffe6cbefb06662b8aa4600f77
  F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
  F test/affinity3.test 6a101af2fc945ce2912f6fe54dd646018551710d
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@@ -738,15 -736,15 +740,15 @@@ F test/crashtest1.c 09c1c7d728ccf4feb9e
  F test/createtab.test b5de160630b209c4b8925bdcbbaf48cc90b67fe8
  F test/cse.test 277350a26264495e86b1785f34d2d0c8600e021c
  F test/csv01.test 526fc6aefd052badd5a0283f86b4b395c3df76bfe98d96c801f494f5e2c7836c
 -F test/ctime.test 78749e6c9a5f0010d67985be80788f841e3cd2da18114e2ed6010399a7d807f3
 +F test/ctime.test 9d4a932b6fd74df540492b17bedc570abf3e6f9622db33a36363f6fe580bd2b5
  F test/cursorhint.test 7bc346788390475e77a345da2b92270d04d35856
- F test/cursorhint2.test 8457e93d97f665f23f97cdbc8477d16e3480331b
+ F test/cursorhint2.test 0078ae1ded4afcf5eb80d06e3a72b6e1c3f1a646aab26eeb583b0a9ec6f0d56e
  F test/date.test 9b73bbeb1b82d9c1f44dec5cf563bf7da58d2373
  F test/date2.test 74c234bece1b016e94dd4ef9c8cc7a199a8806c0e2291cab7ba64bace6350b10
  F test/dbfuzz.c 73047c920d6210e5912c87cdffd9a1c281d4252e
  F test/dbpage.test dbf50a4d361f9e45a979432c727506065113124478a7d2db12074fa655e65d6c
  F test/dbstatus.test c15fa97f743dac7ce996814c84b56317e138895ee15ce27f15b608aa6924c90a
- F test/dbstatus2.test 6305517c4ed584d19c98e4acb7ecf01de92f9b186b1318fcbbd5ce8f09e9c3ca
 -F test/dbstatus2.test f5fe0afed3fa45e57cfa70d1147606c20d2ba23feac78e9a172f2fe8ab5b78ef
++F test/dbstatus2.test ce94261a9e45cfd2d08195a82553c03b45c01e5ebad8a17888aeef818d9da69c
  F test/default.test 0cb49b1c315a0d81c81d775e407f66906a2a604d
  F test/delete.test acc38fca8ee4851467705b1c2cfea64cd26667e5
  F test/delete2.test 3a03f2cca1f9a67ec469915cb8babd6485db43fa
@@@ -1068,13 -1065,13 +1070,13 @@@ F test/mallocJ.test b5d1839da331d96223e
  F test/mallocK.test 27cb5566a6e5f2d76f9d4aa2eca45524401fd61e
  F test/mallocL.test fb311ff80afddf3b1a75e52289081f4754d901dc
  F test/mallocM.test 78bbe9d3da84a5c679123cdb40d7b2010b18fc46e13897e4f253c6ba6fbff134
 -F test/malloc_common.tcl aac62499b76be719fac31e7a3e54a7fd53272e7f
 -F test/manydb.test 28385ae2087967aa05c38624cec7d96ec74feb3e
 +F test/malloc_common.tcl 8d368ee0b9d77c9643b174448f137c18b68e49f4
 +F test/manydb.test 3cd8e52ab3112cb8365afeedd6e8231977920577
  F test/mem5.test c6460fba403c5703141348cd90de1c294188c68f
 -F test/memdb.test c1f2a343ad14398d5d6debda6ea33e80d0dafcc7
 +F test/memdb.test c46019291625650d71416e770f6a54a281a1a98f
- F test/memdb1.test fbe47f36c12725ebdd2760f846371e6eb09f403bd7236fbdddb21aa6e3c652b4
+ F test/memdb1.test 61aa1dbdeea6320791d2ff42a9a6149d5716be674bf06ee0ffa0aad1bf3eb5f8
  F test/memleak.test 10b9c6c57e19fc68c32941495e9ba1c50123f6e2
 -F test/memsubsys1.test 9e7555a22173b8f1c96c281ce289b338fcba2abe8b157f8798ca195bbf1d347e
 +F test/memsubsys1.test 21f6e0e93302665caa03f37bf832afa1e8dde768d3f5547a5c59a03655d3bfaa
  F test/memsubsys2.test 3e4a8d0c05fd3e5fa92017c64666730a520c7e08
  F test/minmax.test 6751e87b409fe11b02e70a306d846fa544e25a41
  F test/minmax2.test dae92964ac87c1d2ef978c582e81a95e11c00f1cbef68980bfb2abaf10315063
@@@ -1304,15 -1304,15 +1309,15 @@@ F test/table.test b708f3e5fa2542fa51dfa
  F test/tableapi.test 2674633fa95d80da917571ebdd759a14d9819126
  F test/tableopts.test dba698ba97251017b7c80d738c198d39ab747930
  F test/tclsqlite.test 5337e8890b96dad1ee541b15fbeec32e6bac2fe7fa096f91089057385aadba9b
 -F test/tempdb.test 4cdaa23ddd8acb4d79cbb1b68ccdfd09b0537aaba909ca69a876157c2a2cbd08
 +F test/tempdb.test 8d0c2ee1cc2286629ca1d7e4e470a8ecf3951b65fb93c6bb7e27fee8ed9f8055
- F test/tempdb2.test 27e41ed540b2f9b056c2e77e9bddc1b875358507
+ F test/tempdb2.test 4749545409c6d7438b435c3f05cdd139cf4145a954a6908d19e3443ffd8724b3
  F test/tempfault.test 0c0d349c9a99bf5f374655742577f8712c647900
  F test/temptable.test d2c9b87a54147161bcd1822e30c1d1cd891e5b30
- F test/temptable2.test cd396beb41117a5302fff61767c35fa4270a0d5e
+ F test/temptable2.test d2940417496e2b9548e01d09990763fbe88c316504033256d51493e1f1a5ce6a
  F test/temptable3.test d11a0974e52b347e45ee54ef1923c91ed91e4637
  F test/temptrigger.test 38f0ca479b1822d3117069e014daabcaacefffcc
 -F test/tester.tcl 94901a4625d9a2229666dd5c44120ddf7f0fb639470710ef74a4cefc7b039e07
 +F test/tester.tcl 63fca9a766cd84060e137e81419ea5ae384960e3354281ce8e4983e203d53736
- F test/thread001.test 9f22fd3525a307ff42a326b6bc7b0465be1745a5
+ F test/thread001.test b61a29dd87cf669f5f6ac96124a7c97d71b0c80d9012746072055877055cf9ef
  F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
  F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
  F test/thread004.test f51dfc3936184aaf73ee85f315224baad272a87f
@@@ -1655,8 -1655,8 +1660,8 @@@ F tool/mkshellc.tcl 1f45770aea226ac093a
  F tool/mksourceid.c d458f9004c837bee87a6382228ac20d3eae3c49ea3b0a5aace936f8b60748d3b
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
  F tool/mksqlite3c-noext.tcl fef88397668ae83166735c41af99d79f56afaabb
 -F tool/mksqlite3c.tcl a03cee30de81a2e67b93e5c659f24113a003677c557daeb008205c8e6d4345d6
 +F tool/mksqlite3c.tcl 331eb5ff5893189a70df4a2312fb8c4ebc3f941edc631a166bb7c6945474b415
- F tool/mksqlite3h.tcl f92f994d9709aeb9e2b6e6f9fc8b069d2f55202c8e23f453edc44390a25982dc
+ F tool/mksqlite3h.tcl 080873e3856eceb9d289a08a00c4b30f875ea3feadcbece796bd509b1532792c
  F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b
  F tool/mkvsix.tcl b9e0777a213c23156b6542842c238479e496ebf5
  F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091
@@@ -1717,7 -1717,10 +1722,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 27e20d699872b2b84575ca63864163e4ae8b65ecfc33f042dbecde323ccff7c2 48a06eb02b42a021b835ff9766535805723259b9701b87fb17fa488b133cb53a
- R 2b9ab3a159d521e1ca8e81c6e5e6a15d
 -P 1fdaf2c34431adcac1c7ff29aae0623c4cbaa6a7f38e843c786bd407d8b3e730
 -R 4cac5ebce3c2344d130b0b75df1b28c6
 -T +bgcolor * #d0c0ff
 -T +sym-release *
 -T +sym-version-3.23.1 *
++P a658f80c8f3babb6f992f3c5a5b2f87d995239fb24a00f258bd615d39bfda0fa 4bb2294022060e61de7da5c227a69ccd846ba330e31626ebcd59a94efd148b3b
++R 4c45b9160a1fd858697e9acf9c2dbdc4
  U drh
- Z 3c059a59ae79e229fbadb8b43ff4b995
 -Z 96974a1a3d914d4bcb8af6c333b7c418
++Z 263e7e47a6e758fa00b2667c9b3675f8

diff --cc manifest.uuid
index 2bd597da7337034201b8c8b64d4baab5c8d00282,7055af6db3ebbdb932e4145baed965e1e6625aa0..498569ee462c6a2d7028327c13247b7f933f7bfb
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- a658f80c8f3babb6f992f3c5a5b2f87d995239fb24a00f258bd615d39bfda0fa
 -4bb2294022060e61de7da5c227a69ccd846ba330e31626ebcd59a94efd148b3b
++e20fcb5159f2a74ea60ac6a0287165d114fc71d7510a6d9068962f239dde619f

diff --cc src/btree.c
Simple merge

diff --cc src/main.c
index c43d1927547e3da4370b7c83d49050027e0f4890,5b6c86709750abdee5f91a2db0c6895e40d79db8..a30bfca58dda90c7ebb6e330bf1065bf1f232b89
--- 1/src/main.c
--- 2/src/main.c
+++ b/src/main.c
@@@ -3712,18 -3628,8 +3748,16 @@@ int sqlite3_file_control(sqlite3 *db, c
      }else if( op==SQLITE_FCNTL_JOURNAL_POINTER ){
        *(sqlite3_file**)pArg = sqlite3PagerJrnlFile(pPager);
        rc = SQLITE_OK;
-     }else if( fd->pMethods ){
-       rc = sqlite3OsFileControl(fd, op, pArg);
 +#ifndef SQLITE_OMIT_WAL
 +      if( (rc==SQLITE_OK)&&(op==SQLITE_FCNTL_LAST_ERRNO)&&(*(int *)pArg==0) ){
 +        sqlite3_file *pWalFd = sqlite3PagerWalFile(pPager);
 +        if( pWalFd&&(pWalFd->pMethods) ){
 +          rc = sqlite3OsFileControl(pWalFd, op, pArg);
 +        }
 +      }
 +#endif
      }else{
-       rc = SQLITE_NOTFOUND;
+       rc = sqlite3OsFileControl(fd, op, pArg);
      }
      sqlite3BtreeLeave(pBtree);
    }

diff --cc src/os.c
Simple merge

diff --cc src/os_unix.c
Simple merge

diff --cc src/pager.c
index 72dcc5e77593fd06a24bed96ded002badee1b4a8,a5e1edf7829065d30a7a731bbc14099a01c871ba..28b53c81d045cc77b10908f4b8ecaea111680f74
--- 1/src/pager.c
--- 2/src/pager.c
+++ b/src/pager.c
@@@ -6993,18 -6964,16 +6987,28 @@@ sqlite3_file *sqlite3PagerFile(Pager *p
    return pPager->fd;
  }
  
 +#if !defined(SQLITE_OMIT_WAL)
 +/*
 + ** Return the file handle for the WAL journal file associated
 + ** with the pager.  This might return NULL if the file has
 + ** not yet been opened.
 + */
 +sqlite3_file *sqlite3PagerWalFile(Pager *pPager){
 +  return ((pPager->pWal) ? sqlite3WalFile(pPager->pWal) : (NULL));
 +}
 +#endif
 +
 +
+ #ifdef SQLITE_ENABLE_SETLK_TIMEOUT
+ /*
+ ** Reset the lock timeout for pager.
+ */
+ void sqlite3PagerResetLockTimeout(Pager *pPager){
+   int x = 0;
+   sqlite3OsFileControl(pPager->fd, SQLITE_FCNTL_LOCK_TIMEOUT, &x);
+ }
+ #endif
+ 
  /*
  ** Return the file handle for the journal file (if it exists).
  ** This will be either the rollback journal or the WAL file.

diff --cc src/pager.h
Simple merge

diff --cc src/prepare.c
Simple merge

diff --cc src/sqlite.h.in
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc test/dbstatus2.test
Simple merge