Merge all recent trunk changes into the begin-concurrent branch.

FossilOrigin-Name: 0dba9010ad29e83d726f3c63e21baabc4185e1966a5eeb8bc4447c5199681436

diff --cc ext/session/sqlite3session.c
index f069a42e1f37dae611a4353f76af6f2690913adc,1f6c58b4db67af84d096dd21930e1a172d7f1c9f..e2f997393f301b511c160a8f6c5b3db9e2ee9d91
--- 1/ext/session/sqlite3session.c
--- 2/ext/session/sqlite3session.c
+++ b/ext/session/sqlite3session.c
@@@ -2527,8 -2631,11 +2638,12 @@@ int sqlite3session_changeset
    int *pnChangeset,               /* OUT: Size of buffer at *ppChangeset */
    void **ppChangeset              /* OUT: Buffer containing changeset */
  ){
-   return sessionGenerateChangeset(
 -  int rc = sessionGenerateChangeset(pSession, 0, 0, 0, pnChangeset,ppChangeset);
++  int rc = sessionGenerateChangeset(
 +      pSession, SESSIONS_CHANGESET, 0, 0, pnChangeset, ppChangeset);
+   assert( rc || pnChangeset==0 
+        || pSession->bEnableSize==0 || *pnChangeset<=pSession->nMaxChangesetSize 
+   );
+   return rc;
  }
  
  /*

diff --cc ext/session/sqlite3session.h
index 5822a432356023a6f121cc290d2f9eb1684380ba,10d0133901622d690dd2312111116dd418ba9704..0fe0add91ef8fa451efe4d937cee0b945f369aeb
--- 1/ext/session/sqlite3session.h
--- 2/ext/session/sqlite3session.h
+++ b/ext/session/sqlite3session.h
@@@ -323,19 -355,22 +355,35 @@@ int sqlite3session_changeset
    void **ppChangeset              /* OUT: Buffer containing changeset */
  );
  
 +/*
 +** CAPI3REF: Generate A Full Changeset From A Session Object
 +**
 +** This function is similar to sqlite3session_changeset(), except that for
 +** each row affected by an UPDATE statement, all old.* values are recorded
 +** as part of the changeset, not just those modified.
 +*/
 +int sqlite3session_fullchangeset(
 +  sqlite3_session *pSession,      /* Session object */
 +  int *pnChangeset,               /* OUT: Size of buffer at *ppChangeset */
 +  void **ppChangeset              /* OUT: Buffer containing changeset */
 +);
 +
+ /*
+ ** CAPI3REF: Return An Upper-limit For The Size Of The Changeset
+ ** METHOD: sqlite3_session
+ **
+ ** By default, this function always returns 0. For it to return
+ ** a useful result, the sqlite3_session object must have been configured
+ ** to enable this API using sqlite3session_object_config() with the
+ ** SQLITE_SESSION_OBJCONFIG_SIZE verb.
+ **
+ ** When enabled, this function returns an upper limit, in bytes, for the size 
+ ** of the changeset that might be produced if sqlite3session_changeset() were
+ ** called. The final changeset size might be equal to or smaller than the
+ ** size in bytes returned by this function.
+ */
+ sqlite3_int64 sqlite3session_changeset_size(sqlite3_session *pSession);
+ 
  /*
  ** CAPI3REF: Load The Difference Between Tables Into A Session
  ** METHOD: sqlite3_session

diff --cc ext/session/test_session.c
index d968699e029ecea199b212a8836fb744fb5b354a,f2fc77eee3f596fe0b6df982af03f081b78ea051..a681ef9ac2a4330556e397cb3bc372ce74e4e620
--- 1/ext/session/test_session.c
--- 2/ext/session/test_session.c
+++ b/ext/session/test_session.c
@@@ -235,18 -234,20 +235,20 @@@ static int SQLITE_TCLAPI test_session_c
      const char *zSub;
      int nArg;
      const char *zMsg;
 -    int iSub;
    } aSub[] = {
 -    { "attach",       1, "TABLE",      }, /* 0 */
 -    { "changeset",    0, "",           }, /* 1 */
 -    { "delete",       0, "",           }, /* 2 */
 -    { "enable",       1, "BOOL",       }, /* 3 */
 -    { "indirect",     1, "BOOL",       }, /* 4 */
 -    { "isempty",      0, "",           }, /* 5 */
 -    { "table_filter", 1, "SCRIPT",     }, /* 6 */
 +    { "attach",       1, "TABLE"       }, /* 0 */
 +    { "changeset",    0, ""            }, /* 1 */
 +    { "delete",       0, ""            }, /* 2 */
 +    { "enable",       1, "BOOL"        }, /* 3 */
 +    { "indirect",     1, "BOOL"        }, /* 4 */
 +    { "isempty",      0, ""            }, /* 5 */
 +    { "table_filter", 1, "SCRIPT"      }, /* 6 */
      { "patchset",     0, "",           }, /* 7 */
 -    { "diff",         2, "FROMDB TBL", }, /* 8 */
 -    { "memory_used",  0, "",           }, /* 9 */
 +    { "diff",         2, "FROMDB TBL"  }, /* 8 */
 +    { "fullchangeset",0, ""            }, /* 9 */
 +    { "memory_used",  0, "",           }, /* 10 */
+     { "changeset_size", 0, "",         }, /* 10 */
+     { "object_config_size", 1, "INTEGER", }, /* 11 */
      { 0 }
    };
    int iSub;

diff --cc main.mk
index 7b3f3fd3ee87857e0e401424a8adfcfd4014781e,d8b44f4190ac86f6db602f927d4c5c4f0f40ee07..1d6955eb4ec95e53baf0bb08710f7d551926ffc9
--- 1/main.mk
--- 2/main.mk
+++ b/main.mk
@@@ -439,8 -439,8 +439,9 @@@ TESTSRC2 = 
    $(TOP)/ext/async/sqlite3async.c \
    $(TOP)/ext/misc/stmt.c \
    $(TOP)/ext/session/sqlite3session.c \
-   $(TOP)/ext/session/test_session.c 
 +  $(TOP)/ext/session/sqlite3changebatch.c \
+   $(TOP)/ext/session/test_session.c \
+   fts5.c
  
  # Header files used by all library source files.
  #

diff --cc manifest
index 20916a33bf0375bb1709de97593997bf2de10c68,4861e18edee2fdcfb4ebfade834f45aba7808326..6bcb4d971b1024ffd9000843f333979d4f68e730
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\slatest\strunk\schanges\sinto\sthis\sbranch.
- D 2021-04-02T20:29:38.293
 -C Fix\sa\sfaulty\sassert()\sstatement\sin\ssqlite3ExprListDup().\sThis\sis\sa\scontinuation\nof\sthe\sfix\sat\s[59812e7ef705226c].
 -D 2021-05-20T23:25:28.287
++C Merge\sall\srecent\strunk\schanges\sinto\sthe\sbegin-concurrent\sbranch.
++D 2021-05-21T15:33:49.363
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -456,20 -453,19 +456,21 @@@ F ext/session/sessioninvert.test 040755
  F ext/session/sessionmem.test f2a735db84a3e9e19f571033b725b0b2daf847f3f28b1da55a0c1a4e74f1de09
  F ext/session/sessionnoop.test a9366a36a95ef85f8a3687856ebef46983df399541174cb1ede2ee53b8011bc7
  F ext/session/sessionrebase.test ccfa716b23bd1d3b03217ee58cfd90c78d4b99f53e6a9a2f05e82363b9142810
+ F ext/session/sessionsize.test 6f644aff31c7f1e4871e9ff3542766e18da68fc7e587b83a347ea9820a002dd8
  F ext/session/sessionstat1.test 218d351cf9fcd6648f125a26b607b140310160184723c2666091b54450a68fb5
  F ext/session/sessionwor.test 6fd9a2256442cebde5b2284936ae9e0d54bde692d0f5fd009ecef8511f4cf3fc
 -F ext/session/sqlite3session.c 703634ca25b4b903ae8ec25045802a8c8deca36a65d2b993c4bc8888f6d6c7ee
 -F ext/session/sqlite3session.h 0907de79bc13a2e3af30a6dc29acc60792a3eaf7d33d44cf52500d0f3c2b2171
 -F ext/session/test_session.c f433f68a8a8c64b0f5bc74dc725078f12483301ad4ae8375205eef790274a787
 +F ext/session/sqlite3changebatch.c d5553b79e012ee2cb06c0a96bdf9dfe19e66354390ea0036cc46c4953142d517
 +F ext/session/sqlite3changebatch.h e72016998c9a22d439ddfd547b69e1ebac810c24
- F ext/session/sqlite3session.c 5eb3a3cb490912376c5720d24eb256753e4a29a2a62f39ac708a084d854b4fea
- F ext/session/sqlite3session.h 5fde30dfa4050a817d158a923bf47647ae2701df745144e9cfb75a1af7565511
- F ext/session/test_session.c 18372dfe254a219705f89bc95c5ef26744236c4dbac5cdfbe71959290afc928d
++F ext/session/sqlite3session.c 381b2437cd5607193b5bf4c07b7f6026adfd7a3258435af1ee8f833eaf935b99
++F ext/session/sqlite3session.h c26e54521584ad26dcb459171d94bbe6412ca26ed4613551c7f0c80aad129abd
++F ext/session/test_session.c a8b3a42a315ac8e9bf55d1a0ccfed296b699977691a51262bda31b6c6cc69c06
  F ext/userauth/sqlite3userauth.h 7f3ea8c4686db8e40b0a0e7a8e0b00fac13aa7a3
  F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
  F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk 4d3bf0ef1b454e7308ea7307b6a50f480e242cfdccfff63a42a3a450ae22e186
 -F main.mk d1654e2923a7195603a7d6564dabe037a3a20ea5b3817002db534ffc4ad8cecf
++F main.mk e9da85847176fff5fcafea51ced72fd23bc33db8335628eeba0a97d0a50ba8cb
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@@ -481,37 -477,37 +482,37 @@@ F spec.template 86a4a43b99ebb3e75e6b9a7
  F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
  F sqlite3.1 fc7ad8990fc8409983309bb80de8c811a7506786
  F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
- F src/alter.c ee335771956c1b674ec5f3f943cf7179f877accf208c498271c72b4ea8d16409
+ F src/alter.c df53c39fd4f32528fc7ad8188b3bf2b506e1a8b3bb975b14f16a1bc6e901950f
  F src/analyze.c 01c6c6765cb4d40b473b71d85535093730770bb186f2f473abac25f07fcdee5c
- F src/attach.c 9cbe761e464025694df8e6f6ee4d9f41432c3a255ca9443ccbb4130eeb87cf72
+ F src/attach.c a514e81758ba7b3a3a0501faf70af6cfc509de8810235db726cfc9f25165e929
  F src/auth.c 08954fdc4cc2da5264ba5b75cfd90b67a6fc7d1710a02ccf917c38eadec77853
  F src/backup.c 3014889fa06e20e6adfa0d07b60097eec1f6e5b06671625f476a714d2356513d
 -F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
 +F src/bitvec.c 8433d9e98dd6f2ea3286e0d2fe5d65de1bfc18a706486eb2026b01be066b5806
  F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
- F src/btree.c d20d20223840198f37e02a2e6816858e1373908003d793d762a2688f886dc557
 -F src/btree.c 51ba86095316fceb3e25bc61617d673d84627e79f4ace83f8722910f33eedef3
 -F src/btree.h 096cc53baa58be22b02c896d1cf933c38cfc6d65f9253c1367ece8cc88a24de5
 -F src/btreeInt.h 7bc15a24a02662409ebcd6aeaa1065522d14b7fda71573a2b0568b458f514ae0
 -F src/build.c daeb1beb04e3729456f095686bc26bb0cde026263fc281257d431ba22c2e7f21
++F src/btree.c c48a67a825d4b9df9c86d5f44ad9cca92c7059dc84a3e00db7b519e160449f5e
 +F src/btree.h ccdc64bd1eee7ba79d4c0b2af22b6df1e5ededdbf9606f45f4fca4738dd6fa0b
 +F src/btreeInt.h 1e9f10107a4ec5d2940ae5b859242ae83b81402986724bed08b8491a5ea64a4d
- F src/build.c 104c98c0c451c705065d1ee2bb6202477389cfaeeab72f67702b7380826c93af
++F src/build.c 3a6da77c49a36ad578e9d534597e649256a5bd5c12676a17d837cfc1a381948a
  F src/callback.c d0b853dd413255d2e337b34545e54d888ea02f20da5ad0e63585b389624c4a6c
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
- F src/ctime.c 2a322b9a3d75771fb4d99e0702851f4f68dda982507a0f798eefb0712969a410
+ F src/ctime.c 3052b6b05ed9ef547a3dd66b8e01bfa9d582e78752ad6ed327da84652641e038
  F src/date.c e0632f335952b32401482d099321bbf12716b29d6e72836b53ae49683ebae4bf
  F src/dbpage.c 8a01e865bf8bc6d7b1844b4314443a6436c07c3efe1d488ed89e81719047833a
  F src/dbstat.c 3aa79fc3aed7ce906e4ea6c10e85d657299e304f6049861fe300053ac57de36c
  F src/delete.c 73f57a9a183532c344a3135cf8f2a5589376e39183e0b5f562d6b61b2af0f4d8
- F src/expr.c 1bf346b7efbe37f62aab7079fdc9ee1aa13e9bea29dbb161f9e7036db9df24e2
+ F src/expr.c c56c74d40d1ca5359177f1425d2eb2aa050c30da0b49e014da1f109aa38ece0f
  F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
  F src/fkey.c e9063648396c58778f77583a678342fe4a9bc82436bf23c5f9f444f2df0fdaa4
- F src/func.c e701e9a1cbc2e1814d381ce781925c2e8776cdf994e7c17f53578ec3cc7af40a
- F src/global.c 56d6762a3a44495ab035e2d3185eeccbc98579e18c06038e1bb9af346105bc84
 -F src/func.c 88fd711754a7241cb9f8eb1391370fd0c0cea756b3358efa274c5d1efd59af93
++F src/func.c 0e97ea309f882c4045a73d25219d816e60d2baf3c60068bb5d74f801a46355a9
+ F src/global.c 25ba4d58476f6be29bba9d9d14f7f146b78476d3a4d75ebb8c3b736328afe0f9
  F src/hash.c 8d7dda241d0ebdafb6ffdeda3149a412d7df75102cecfc1021c98d6219823b19
  F src/hash.h 9d56a9079d523b648774c1784b74b89bd93fac7b365210157482e4319a468f38
  F src/hwtime.h cb1d7e3e1ed94b7aa6fde95ae2c2daccc3df826be26fc9ed7fd90d1750ae6144
  F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
- F src/insert.c f8d462ab6174a2c30476b5a1fc77f4d66ce7d9dd45c994966b9f4445db1131f0
+ F src/insert.c 2189e0e596010a0dc5405d9f14f78db1ee2fa71138c931f5b6ea96610b95bfc1
  F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
  F src/loadext.c 8c9c8cd2bd8eecdb06d9b6e89de7e9e65bae45cc8fc33609cc74023a5c296067
- F src/main.c 5becd80bb8369fe73cea609ac830dd43453d0a356c56ef361fd74698988484a0
 -F src/main.c 2b2044221a10e7c5f49a98f50563ce9a944511241ba5946d1754dcc2a7437a07
++F src/main.c 28f45be66f575edf05465a2bc91ec50ebff6bb49099ef884f4dd506d83fd7769
  F src/malloc.c c1af4ac5a463648cd2953fd4ac679b3ba9022ce5ec794a60806150ad69dfd33a
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
@@@ -531,33 -527,33 +532,33 @@@ F src/os.c 6e94cd64b134c9317e52ad534117
  F src/os.h 48388821692e87da174ea198bf96b1b2d9d83be5dfc908f673ee21fafbe0d432
  F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
  F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
- F src/os_unix.c 9ee493ab91a3b20f5671ff3b4447ddbb64ae653b013258f676d75f6f658414eb
 -F src/os_unix.c efa60c1cb54dba767abbba3c6dd67d3df5ef8aa26e2e499c37f055f56a374068
++F src/os_unix.c ff4738e222bbbc2ecc396398c8ba1ae757bee03b782a8dd8bc8a5d39128e52d1
  F src/os_win.c 77d39873836f1831a9b0b91894fec45ab0e9ca8e067dc8c549e1d1eca1566fe9
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
- F src/pager.c 0122015aef06338c61d0b94df77bce4a670c0376dd88ec27260d0ba319d2f869
 -F src/pager.c 95c255256b13827caf038c8f963d334784073f38ab6ef9d70371d9d04f3c43e0
 -F src/pager.h 4bf9b3213a4b2bebbced5eaa8b219cf25d4a82f385d093cd64b7e93e5285f66f
 -F src/parse.y ac294bd2891c4310b0b23a67ea3bbca2d0bf5b7662c4444b6517c3986be4a437
++F src/pager.c 12b7e6f061247cc7e24d81dddd0161ba9e317ef3c3b93f0a299873746a07d989
 +F src/pager.h fdc30693c403aa9b4293d0b126346db7e450f8f0e5d2c1bb8355acb1cb8da6fd
- F src/parse.y 3a7f2156485e377a637b4217b797001cf2ed9228e501f8d34fd06a9f46a40a73
++F src/parse.y 68f3bdc6ab07f5660944cde812318eab6007416fd1ea008422a96f1675c75ff2
  F src/pcache.c 385ff064bca69789d199a98e2169445dc16e4291fa807babd61d4890c3b34177
  F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586
  F src/pcache1.c 388304fd2d91c39591080b5e0f3c62cfba87db20370e7e0554062bfb29740e9f
  F src/pragma.c eb42cb9bec189cf18cef5d8fcae56e13bb73ef2b019b198fb48740ced81bce95
  F src/pragma.h 8dc78ab7e9ec6ce3ded8332810a2066f1ef6267e2e03cd7356ee00276125c6cf
- F src/prepare.c e21b54489b5c73b06ada15e6fc79b5c6f64b06701924a6ca98944ae59e06256f
+ F src/prepare.c d778af9986f3b0107c5b255dcfe2696e8e99e00fb77c5115bbfea4e92c3302e7
  F src/printf.c 78fabb49b9ac9a12dd1c89d744abdc9b67fd3205e62967e158f78b965a29ec4b
 -F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 +F src/random.c c984d8426d76752dbd9ff7983e770731ae5e8f4ede84a203df9878d5e8798f11
- F src/resolve.c fc136d935f19966747663bed605ad7f06f84f9fe7bf7bf79e9bf844ef5c7556d
+ F src/resolve.c 40e216d9a72e52841a9c8e0aec7d367bade8e2df17b804653b539b20c1ab5660
  F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
- F src/select.c 2bc2bac7de5024adf3bb218462e593e35b945f1660488769c0ebe7891e26d948
- F src/shell.c.in dcce260883836c9b58847505fbccce8d5546af925046f7dacd9443e922ece036
- F src/sqlite.h.in d1ce4ee7d0571319a73c6d69e28d11dce1769382ac9d4a95b2847bd875c08fcf
 -F src/select.c 8f9ecc60f9ffb5954f726d2adf5722c638072260838490d0349e71d2e4a31822
++F src/select.c 52ed98f39e1629ccf568b372f29b376ca6007158a46cdd956dbdcf8cab05fc89
+ F src/shell.c.in 1b32ba2918ede13b68df47c7b92b72ba0d06e68d384e78bb9d7456527271d400
 -F src/sqlite.h.in 5c950066775ca9efdaa49077c05d38d0bef6418f3bd07d2dce0210f1d2f3c326
++F src/sqlite.h.in a5d8462d3c5a45240a258e6ed401b6fc14b7f4d2e00e94b864c31fc019151ce1
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 61b38c073d5e1e96a3d45271b257aef27d0d13da2bea5347692ae579475cd95e
- F src/sqliteInt.h c001113a83ab9832a4d2122c0921de6acfbbfe0cdc26708ba89b194c2b04cea4
 -F src/sqliteInt.h 6d0c49ed218f9f6ffabfdc8bed1a5de89f61e70c96a62156aeebeb20c1be9bf0
++F src/sqliteInt.h e4c952b9177da8d672c1315f3158a33a4300d4c9880af996bffff39cb3dc2240
  F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
  F src/status.c 4b8bc2a6905163a38b739854a35b826c737333fab5b1f8e03fa7eb9a4799c4c1
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
- F src/tclsqlite.c 986b6391f02cd9b53c1d688be55899f6ffddeb8e8014cd83c1b73ff912579a71
+ F src/tclsqlite.c 97645e4a15dde6a6ad6de8d81057ff9869413b866015a89e208fedacd709493e
 -F src/test1.c 2100f4c28bae21ce83a9a0c5ec6827efd0e15d11b93b569b614daa5654b3fcf6
 +F src/test1.c bb6fe83c5a0e255930c14cc6f0b29414410661839fcdd95015abed823df636b4
  F src/test2.c 3efb99ab7f1fc8d154933e02ae1378bac9637da5
  F src/test3.c 61798bb0d38b915067a8c8e03f5a534b431181f802659a6616f9b4ff7d872644
  F src/test4.c 7c4420e01c577b5c4add2cb03119743b1a357543d347773b9e717195ea967159
@@@ -572,7 -568,7 +573,7 @@@ F src/test_backup.c bf5da90c9926df0a4b9
  F src/test_bestindex.c 78809f11026f18a93fcfd798d9479cba37e1201c830260bf1edc674b2fa9b857
  F src/test_blob.c ae4a0620b478548afb67963095a7417cd06a4ec0a56adb453542203bfdcb31ce
  F src/test_btree.c 8b2dc8b8848cf3a4db93f11578f075e82252a274
- F src/test_config.c 21aa5fc3e6bb11c60ba7f9a33b73951af8cb7a2042355f07469146b7e5e36765
 -F src/test_config.c 9c8e12823c46082a01765addf43be9309889f4e9dfb5a512a6c974e1c4efb413
++F src/test_config.c 7768197f40225aacf0ab4a325b0c30c0dd6ebdf2c64f62da90ad5d4989b42bf5
  F src/test_delete.c e2fe07646dff6300b48d49b2fee2fe192ed389e834dd635e3b3bac0ce0bf9f8f
  F src/test_demovfs.c 86142ba864d4297d54c5b2e972e74f3141ae4b30f05b3a95824184ed2d3d7f91
  F src/test_devsym.c aff2255ea290d7718da08af30cdf18e470ff7325a5eff63e0057b1496ed66593
@@@ -618,27 -614,27 +619,27 @@@ F src/update.c 56fa0458b1ffc1042629f926
  F src/upsert.c df8f1727d62b5987c4fd302cd4d7c0c84ae57cd65683c5a34a740dfe24039235
  F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
  F src/util.c 41c7a72da1df47864faa378a1c720b38adb288c6838cb6be5594511b6287a048
 -F src/vacuum.c 492422c1463c076473bae1858799c7a0a5fe87a133d1223239447c422cd26286
 -F src/vdbe.c 73e5a8b64a77359f4287d76f168e89d12ba967cbb72a3d7619650568e9c1d66c
 +F src/vacuum.c 9d6ac090ff36d80f0a2c5bfc63994b714c464bfc44efa5056c457a6a4163dc99
- F src/vdbe.c 619f5a46e9b7de7e9791b795364d400efccedca48a2dab044909bb4ff5a220ab
++F src/vdbe.c 897ee680a162cb407457fcf3b4220d38e115de02612254602fdc8ecc881cc1e8
  F src/vdbe.h 25dabb25c7e157b84e59260cfb5b466c3ac103ede9f36f4db371332c47601abe
- F src/vdbeInt.h 000d9ab1ea4cb55a80de15e28f3f595645b4fddef34bca4347fb3db8031d9041
- F src/vdbeapi.c 4a43e303ec3354c785f453e881521969378e85628278ab74ba4a9df790c0d93b
- F src/vdbeaux.c 816663d5ab438d5bf373aaab876de8bb5c05ba08d4dd7cf74c3fd6937c796b07
- F src/vdbeblob.c 253ed82894924c362a7fa3079551d3554cd1cdace39aa833da77d3bc67e7c1b1
- F src/vdbemem.c 947f2a65910edb4014dc981d33e414a68c51f169f9df8c4c493a0ba840b6eb1f
+ F src/vdbeInt.h 58980223a32495ad059d10581b83e133abdc77248b1bab85c080cab8a13bd819
+ F src/vdbeapi.c d9e99daf59fec928986838b3389a7337e82fec6b3b5de30206cb99fb4661b94e
 -F src/vdbeaux.c 065a10392378109f08435bd50d03dff315e384cde2831d6b8dbaec05f33b10af
++F src/vdbeaux.c 708f3479a4b1f895f654e29b4fa597ee4c2927ecde3a27ed07dda964a3a12b3a
+ F src/vdbeblob.c c6b8db50b227f66fb404215732068df76485b5b433e5f9d4d9ac27410b218193
+ F src/vdbemem.c 175c73ced03edbb0f6567a41c8032afaeb83372090fa7bddfc88a67e28da2b8a
  F src/vdbesort.c f5b5e473a7cee44e47a94817b042fd7172cf3aa2c0a7928a8339d612bcfdec5a
  F src/vdbetrace.c 666c6fd9f1b62be6999e072a45b913e3c2c3518bc60dfd4d54fe304130acb724
  F src/vdbevtab.c f99b275366c5fc5e2d99f734729880994ab9500bdafde7fae3b02d562b9d323c
- F src/vtab.c 032a0165c147fda16927e6a3230e90c068d4af93f887ce94e26f678fe48e5e4c
+ F src/vtab.c b928405ccb66040fc6c3a11eaa93ddb02cbf20f9ab6860b301b222b9b50dc089
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
- F src/wal.c c9dfe3054c82aaa8d1dea91b56afa9397b54e55d5fb1dcbac32a4a7f6231bdc9
 -F src/wal.c c8ec20a1ca161d5635a4f19c2a4efec2e006e19a8a61f272bf6bce1c80ab7436
 -F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
++F src/wal.c 59ad6d70c32f6e52d9695b081a429b5c2ed76b116bee5dcfed88d3e78148164a
 +F src/wal.h 7ffe787437f20a098af347011967a6d3bb8e5c3dc645e6be59eff44d2b2c5297
- F src/walker.c d42d6c80ea363ef689a462e65eefcfe87deab924c50de5baa37ecb6af7d7ddaa
- F src/where.c 07d1232df6fc4705815b0ef5182fe3e56bdba6ac09ce52bd66ecb207626aac2b
- F src/whereInt.h 446e5e8018f83358ef917cf32d8e6a86dc8430113d0b17e720f1839d3faa44c4
- F src/wherecode.c c7354c9749f015f37bc32e15a4257a5155fa5d2b79f605f528bd09f3b9f1b4e6
- F src/whereexpr.c 4ba94b8ebbff97c658b212de6ccdb6d3a41847800bdf99e7a2a967c250269f2c
- F src/window.c 32b03808aff2e7263889cce0cbcb2a68efefc2a9d5187514ddb6a2a1046dc7f5
+ F src/walker.c 7342becedf3f8a26f9817f08436bdf8b56ad69af83705f6b9320a0ad3092c2ac
+ F src/where.c 32f41c3c93c6785e0077e3a2cdc669c3ccfe70173787847be77f294c18fc7dc3
+ F src/whereInt.h 9248161dd004f625ce5d3841ca9b99fed3fc8d61522cf76340fc5217dbe1375b
+ F src/wherecode.c 110ed13049e0f1dc27e9dd942eb870417b36480cb7819302f5804cbcf9330b0e
+ F src/whereexpr.c 5a9c9f5d2dac4bcdcaae3035034b4667523f731df228e0bb1d4efc669efa9da5
+ F src/window.c ce5e73ab88a8527d268673906bf89cbe58c61bca8d54d38ed8c33c3220a276ee
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/affinity2.test ce1aafc86e110685b324e9a763eab4f2a73f737842ec3b687bd965867de90627
  F test/affinity3.test eecb0dabee4b7765a8465439d5e99429279ffba23ca74a7eae270a452799f9e7
@@@ -813,9 -799,9 +814,9 @@@ F test/corruptH.test 79801d97ec5c2f9f3c
  F test/corruptI.test a17bbf54fdde78d43cf3cc34b0057719fd4a173a3d824285b67dc5257c064c7b
  F test/corruptJ.test 4d5ccc4bf959464229a836d60142831ef76a5aa4
  F test/corruptK.test 5b4212fe346699831c5ad559a62c54e11c0611bdde1ea8423a091f9c01aa32af
- F test/corruptL.test 22589f503602cc5984e80f27f46c4de2134f24f1515ba2440513c377cb692258
+ F test/corruptL.test df132ba9ffd6fa15038380b4154998b9904ab8f1ea78400d7da53c920cb3b13d
  F test/corruptM.test 7d574320e08c1b36caa3e47262061f186367d593a7e305d35f15289cc2c3e067
- F test/corruptN.test 781c5f26a2d8918f03d45ac4968a738031eeb113a4b153c7588756d9b09c7b04
 -F test/corruptN.test f56e3417fe9a444efd765ae55acbe65595d7b8f747785fe0fd785dbdc424932a
++F test/corruptN.test 187d14093c333ddc705ea6c4aef8355febf260d5174d1b7cbc31c1ac8867951d
  F test/cost.test b11cdbf9f11ffe8ef99c9881bf390e61fe92baf2182bad1dbe6de59a7295c576
  F test/count.test 5364003488249957750a5f15ee42ca1cd7b100b1131c2dc71fff266a1250bf55
  F test/countofview.test e17d6e6688cf74f22783c9ec6e788c0790ee4fbbaee713affd00b1ac0bb39b86
@@@ -1475,8 -1461,9 +1475,9 @@@ F test/thread2.test f35d2106452b77523b3
  F test/thread_common.tcl 334639cadcb9f912bf82aa73f49efd5282e6cadd
  F test/threadtest1.c 6029d9c5567db28e6dc908a0c63099c3ba6c383b
  F test/threadtest2.c a70a8e94bef23339d34226eb9521015ef99f4df8
 -F test/threadtest3.c e63013af10cf236c7610eb06d33bde08c861806dc64be811940ff4d9ddd34a4f
 +F test/threadtest3.c cfd72c74a40de3eb7576f1ab2da28183390deadb13f2aa5c8d077aacd41eda60
  F test/threadtest4.c c1e67136ceb6c7ec8184e56ac61db28f96bd2925
+ F test/threadtest5.c 9b4d782c58d8915d7e955ff8051f3d03628bda0d33b82971ea8c0f2f2808c421
  F test/time-wordcount.sh 8e0b0f8109367827ad5d58f5cc849705731e4b90
  F test/tkt-02a8e81d44.test 6c80d9c7514e2a42d4918bf87bf6bc54f379110c
  F test/tkt-18458b1a.test 6a62cb1ee50fa3c620da59e3a6f531eb38fceaf7e2166203816b724524e6f1d6
@@@ -1927,7 -1914,7 +1929,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 988da36c862f187aea2411520c127545e0fff34143d5cd0e61c928b4972fce64 e16da5af822ef31d7e05992403cf9787fbb3d9abb0b5283aba55ea07e1830a72
- R 3ead4d840f29d1a582002978ed6555e3
- U dan
- Z 467760f1442e2f3a695ebbca2f16d71d
 -P 179dcb6ba771f0e94e06b5e3c5534d8005d27b2c9b4601be20fd68abfbc5dfd0
 -R b65f4b641381f2377ccb77e896547360
++P 9842084230b8a0a4e0a470b6fdacfe2ac5d36f4272b8d1141e0d3b7b66ae6d6d 240f7494bfa3e0806ae2f971e78039c62a419de647cb9e807309f90e1d2a536d
++R a4e2503d9411d8c20e84c1e3e63d9976
+ U drh
 -Z 83b95a83b421e548ed773aa244b4a289
++Z 62b01762a5b615ccf42aa7fa3182ffac

diff --cc manifest.uuid
index 1342661d363413b3b414161cfad93eea79966808,d2cf9163e89b8fd415fad8c34921f3d3127626ef..f6debdf2d1e8428d0402861cdf7ae4c8bc093d8d
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 9842084230b8a0a4e0a470b6fdacfe2ac5d36f4272b8d1141e0d3b7b66ae6d6d
 -240f7494bfa3e0806ae2f971e78039c62a419de647cb9e807309f90e1d2a536d
++0dba9010ad29e83d726f3c63e21baabc4185e1966a5eeb8bc4447c5199681436

diff --cc src/btree.c
index 12958c9c41083105659bddf269e7f6e53884cd05,300bb361e0ab0751e5bc6dd54edf33fca8140d31..b5442df9e4e9dd9cf15362e3dc0f2aceae3715f6
--- 1/src/btree.c
--- 2/src/btree.c
+++ b/src/btree.c
@@@ -9924,10 -9485,10 +9955,10 @@@ static int clearDatabasePage
    for(i=0; i<pPage->nCell; i++){
      pCell = findCell(pPage, i);
      if( !pPage->leaf ){
 -      rc = clearDatabasePage(pBt, get4byte(pCell), 1, pnChange);
 +      rc = clearDatabasePage(pBt, get4byte(pCell), 1, pnChange, pgnoRoot);
        if( rc ) goto cleardatabasepage_out;
      }
-     rc = clearCell(pPage, pCell, &info);
+     BTREE_CLEAR_CELL(rc, pPage, pCell, info);
      if( rc ) goto cleardatabasepage_out;
    }
    if( !pPage->leaf ){
@@@ -9977,8 -9536,10 +10008,10 @@@ int sqlite3BtreeClearTable(Btree *p, in
      /* Invalidate all incrblob cursors open on table iTable (assuming iTable
      ** is the root of a table b-tree - if it is not, the following call is
      ** a no-op).  */
-     invalidateIncrblobCursors(p, (Pgno)iTable, 0, 1);
+     if( p->hasIncrblobCur ){
+       invalidateIncrblobCursors(p, (Pgno)iTable, 0, 1);
+     }
 -    rc = clearDatabasePage(pBt, (Pgno)iTable, 0, pnChange);
 +    rc = clearDatabasePage(pBt, (Pgno)iTable, 0, pnChange, (Pgno)iTable);
    }
    sqlite3BtreeLeave(p);
    return rc;

diff --cc src/build.c
index 570e4aaf97556a9785645dbaa8ec0523439aab4a,4f76c9380f66a5392756215e8c35f081ae076e92..13f54e0fad1240a75dd30a679171996018caa36c
--- 1/src/build.c
--- 2/src/build.c
+++ b/src/build.c
@@@ -86,6 -82,17 +82,19 @@@ static SQLITE_NOINLINE void lockTable
      sqlite3OomFault(pToplevel->db);
    }
  }
+ void sqlite3TableLock(
+   Parse *pParse,     /* Parsing context */
+   int iDb,           /* Index of the database containing the table to lock */
+   Pgno iTab,         /* Root page number of the table to be locked */
+   u8 isWriteLock,    /* True for a write lock */
+   const char *zName  /* Name of the table to be locked */
+ ){
++#ifdef SQLITE_OMIT_CONCURRENT
+   if( iDb==1 ) return;
+   if( !sqlite3BtreeSharable(pParse->db->aDb[iDb].pBt) ) return;
++#endif
+   lockTable(pParse, iDb, iTab, isWriteLock, zName);
+ }
  
  /*
  ** Code an OP_TableLock instruction for each table locked by the

diff --cc src/func.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/os_unix.c
Simple merge

diff --cc src/pager.c
index 8f4cdffbac24e7108366a5e32aae2f2b477083dc,12a78cde8023caf45375f034fce108378749ee83..550178ed9d76748375855da54e6ab4d485bcd1bd
--- 1/src/pager.c
--- 2/src/pager.c
+++ b/src/pager.c
@@@ -5925,8 -5837,9 +5926,8 @@@ int sqlite3PagerBegin(Pager *pPager, in
    assert( pPager->eState>=PAGER_READER && pPager->eState<PAGER_ERROR );
    pPager->subjInMemory = (u8)subjInMemory;
  
-   if( ALWAYS(pPager->eState==PAGER_READER) ){
+   if( pPager->eState==PAGER_READER ){
      assert( pPager->pInJournal==0 );
 -
      if( pagerUseWal(pPager) ){
        /* If the pager is configured to use locking_mode=exclusive, and an
        ** exclusive lock on the database is not already held, obtain it now.

diff --cc src/parse.y
Simple merge

diff --cc src/select.c
Simple merge

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

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/test_config.c
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeaux.c
Simple merge

diff --cc src/wal.c
Simple merge

diff --cc test/corruptN.test
index 4f7667ce1e98b81de2c380ec54d5900e003e4b05,4349468bb59b9396cbc2875f3ff3c74db0339fa0..e6997b24f71ce28745a72474bce04d830a9e0dca
--- 1/test/corruptN.test
--- 2/test/corruptN.test
+++ b/test/corruptN.test
@@@ -102,5 -102,121 +102,121 @@@ do_catchsql_test 1.1 
    VACUUM;
  } {1 {database disk image is malformed}}
  
 -} {1 {database disk image is malformed}}
+ # 2021-04-05 dbsqlfuzz b92b72e4de80b5140c30ab71372ca719b8feb618
+ do_test 2.0 {
+   sqlite3 db {}
+   db deserialize [decode_hexdb {
+ | size 16384 pagesize 4096 filename c-b92b.txt.db
+ | page 1 offset 0
+ |      0: 53 51 4c 69 74 65 20 66 6f 72 6d 61 74 20 33 00   SQLite format 3.
+ |     16: 10 00 01 01 00 40 20 20 00 00 00 00 00 00 00 04   .....@  ........
+ |     32: 00 00 00 00 00 00 00 00 00 00 00 03 00 00 00 04   ................
+ |     48: 00 00 00 00 00 00 00 00 00 00 00 01 00 00 00 00   ................
+ |     96: 00 00 00 00 0d 0f f8 00 04 0f 12 00 0f 91 0f d3   ................
+ |    112: 0f 67 0f 12 00 00 00 00 00 00 00 00 00 00 00 00   .g..............
+ |   3856: 00 00 53 04 07 1b 13 11 08 81 0d 74 72 69 67 67   ..S........trigg
+ |   3872: 65 72 74 72 30 74 31 43 52 45 41 54 45 20 54 52   ertr0t1CREATE TR
+ |   3888: 49 47 47 45 52 20 74 72 30 20 44 45 4c 45 54 45   IGGER tr0 DELETE
+ |   3904: 20 4f 4e 20 74 31 20 42 45 47 49 4e 0a 20 20 55    ON t1 BEGIN.  U
+ |   3920: 50 44 41 54 45 20 74 31 20 53 45 54 20 62 20 3d   PDATE t1 SET b =
+ |   3936: 20 61 3b 0a 45 4e 44 28 03 06 17 11 11 01 3d 69    a;.END(......=i
+ |   3952: 6e 64 65 78 69 30 74 31 04 43 52 45 41 54 45 20   ndexi0t1.CREATE 
+ |   3968: 49 4e 44 45 58 20 69 30 20 4f 4e 20 74 31 28 62   INDEX i0 ON t1(b
+ |   3984: 29 40 01 06 17 11 11 01 6d 74 61 62 6c 65 74 31   )@......mtablet1
+ |   4000: 74 31 02 43 52 45 41 54 45 20 54 41 42 4c 45 20   t1.CREATE TABLE 
+ |   4016: 74 31 28 61 20 55 4e 49 51 55 45 20 4f 4e 20 43   t1(a UNIQUE ON C
+ |   4032: 4f 4e 46 4c 49 43 54 20 52 45 50 4c 41 43 45 2c   ONFLICT REPLACE,
+ |   4048: 20 62 29 23 02 06 17 37 11 01 00 69 6e 64 65 78    b)#...7...index
+ |   4064: 73 71 6c 69 74 65 5f 61 75 74 6f 69 6e 64 65 78   sqlite_autoindex
+ |   4080: 5f 74 31 5f 31 74 31 03 00 00 00 08 00 00 00 00   _t1_1t1.........
+ | page 2 offset 4096
+ |      0: 0d 00 00 00 02 0f 00 00 00 00 00 00 00 00 00 00   ................
+ |   4080: 00 00 05 02 03 01 01 09 0d 05 01 03 01 01 04 0c   ................
+ | page 3 offset 8192
+ |      0: 0a 00 00 00 02 0f f5 00 0f fb 0f f5 00 00 00 00   ................
+ |   4080: 00 00 00 00 00 05 03 01 01 09 02 04 03 01 09 04   ................
+ | page 4 offset 12288
+ |      0: 0a 00 00 00 02 0f f5 00 0f fb 0f f5 00 00 00 00   ................
+ |   4080: 00 00 00 00 00 05 03 01 01 0d 02 04 03 00 00 00   ................
+ | end c-b92b.txt.db
+ }]} {}
+ 
+ prng_seed 0 db
+ do_catchsql_test 2.1 {
+ SELECT count(*) FROM sqlite_schema;
+ WITH RECURSIVE c(x) AS (VALUES(1) UNION ALL SELECT x+1 FROM c WHERE x<1000)
+ INSERT INTO t1(a) SELECT randomblob(null) FROM c;
++} {0 4}
+ 
+ reset_db
+ if {![info exists ::G(perm:presql)]} {
+   do_execsql_test 3.0 {
+     CREATE TABLE t1(x INTEGER PRIMARY KEY AUTOINCREMENT, y);
+     PRAGMA writable_schema = 1;
+     UPDATE sqlite_schema 
+       SET sql = 'CREATE TABLE sqlite_sequence(name-seq)' 
+       WHERE name = 'sqlite_sequence';
+   }
+   db close
+   sqlite3 db test.db
+   do_catchsql_test 3.1 {
+     PRAGMA writable_schema = 1;
+     INSERT INTO t1(y) VALUES('abc');
+   } {1 {database disk image is malformed}}
+   reset_db
+ 
+   do_execsql_test 4.1 {
+     CREATE TABLE x1(a INTEGER PRIMARY KEY, b UNIQUE, c UNIQUE);
+     INSERT INTO x1 VALUES(1, 1, 2);
+     INSERT INTO x1 VALUES(2, 2, 3);
+     INSERT INTO x1 VALUES(3, 3, 4);
+     INSERT INTO x1 VALUES(4, 5, 6);
+     PRAGMA writable_schema = 1;
+ 
+     UPDATE sqlite_schema SET rootpage = (
+       SELECT rootpage FROM sqlite_schema WHERE name = 'sqlite_autoindex_x1_2'
+     ) WHERE name = 'sqlite_autoindex_x1_1';
+   }
+ 
+   db close
+   sqlite3 db test.db
+   breakpoint
+   do_catchsql_test 4.2 {
+     PRAGMA writable_schema = 1;
+     REPLACE INTO x1 VALUES(5, 2, 3);
+   } {1 {database disk image is malformed}}
+ 
+ }
+ 
+ #-------------------------------------------------------------------------
+ 
+ reset_db
+ 
+ ifcapable json1&&vtab {
+   db func strreplace strreplace
+   proc strreplace {orig a b} {
+     string map [list $a $b] $orig
+   }
+ 
+   do_execsql_test 5.0 {
+     CREATE TABLE t1(a, b);
+     CREATE INDEX t1a ON t1(a);
+     CREATE INDEX t1b ON t1(b);
+ 
+     PRAGMA writable_schema = 1;
+     UPDATE sqlite_schema 
+       SET sql = strreplace(sql, 't1', 'json_each') 
+       WHERE type='index';
+   }
+ 
+   db close
+   sqlite3 db test.db
+ 
+   do_execsql_test 5.1 {
+     PRAGMA writable_schema = 1;
+     SELECT * FROM t1
+   }
+ }; # ifcapable json1&&vtab
+ 
  
  finish_test