Merge latest trunk changes into this branch.

FossilOrigin-Name: dbc65a695877306e2add75aba2a279efbb30bfadb5339883cf74aa417f11de86

diff --cc Makefile.in
Simple merge

diff --cc Makefile.msc
Simple merge

diff --cc main.mk
Simple merge

diff --cc manifest
index 566934bffebf2b8e58da05560fa9da30ed3b5eb7,0ac7a150377e861714071d554711b831353d4ef1..6d914bb52337dd13a7c99c95d8fa7928b75ccf72
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,13 -1,13 +1,13 @@@
- C Merge\sversion\s3.35.4\swith\sthis\sbranch.
- D 2021-04-07T15:13:47.077
 -C Fix\sa\sproblem\swith\sSQLITE_MAX_MEMORY\sin\smalloc.c.
 -D 2021-05-21T16:41:22.941
++C Merge\slatest\strunk\schanges\sinto\sthis\sbranch.
++D 2021-05-22T15:05:02.152
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
- F Makefile.in b728d9ef199afe285761e560d8810e7ad4621129c3d47515c484e760d57970d1
 -F Makefile.in 30c6d39386246695e951a676973e0bf57aabbd1e37024c07e657af89dd332555
++F Makefile.in b497ef724bb181d85e5c77fa84f48696f2f8756d4418e89de30284d107eaeb9a
  F Makefile.linux-gcc f609543700659711fbd230eced1f01353117621dccae7b9fb70daa64236c5241
- F Makefile.msc 46c3221d59faccf0502eadd8e6dc69b44f65956b56f88caf74908ccc30010679
- F README.md 1514a365ffca3c138e00c5cc839906108a01011a6b082bad19b09781e3aa498a
- F VERSION 75575cade3e93b31a84ffcb0d40de856a49bd3e4c1028dff52432bfae9806adb
 -F Makefile.msc 6443729ba6a013a0fea4f999b22e54760f36e73c2e691554f0c4bfa1dbe4d070
++F Makefile.msc af85412e8473f170a6dffad929a21e3362103700f79c71d292b13b5540513381
+ F README.md 2a71913f398ecac5f3e10945fcf438aed425c2e9ed9874de561156ba77fb7023
+ F VERSION 8c392f6d70d82e513a0eac622bdf23c43df3e084cb630288beba8cef3012c812
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
  F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
@@@ -38,9 -38,8 +38,9 @@@ F configure c658869fc056a2460a2212fb296
  F configure.ac 4e4b58b32f88c8da9914a2f2c3158f80e69907eccc019fcc7e3ba14ffd91c640
  F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
  F doc/F2FS.txt c1d4a0ae9711cfe0e1d8b019d154f1c29e0d3abfe820787ba1e9ed7691160fcd
- F doc/lemon.html 1bb72ece6271df0d901d233551dd985f2c6ba30d09382cf2d321ed951ab57491
+ F doc/lemon.html efc0cd2345d66905505d98f862e1c571512def0ceb5b016cb658fd4918eb76a3
  F doc/pager-invariants.txt 27fed9a70ddad2088750c4a2b493b63853da2710
 +F doc/shared_schema.md 759fc374709fccf4e5d2d0cbd05f8fedd38fb022bdd8a6c5b5f492684c7023b9
  F doc/trusted-schema.md 33625008620e879c7bcfbbfa079587612c434fa094d338b08242288d358c3e8a
  F doc/vdbesort-memory.md 4da2639c14cd24a31e0af694b1a8dd37eaf277aff3867e9a8cc14046bc49df56
  F doc/vfs-shm.txt e101f27ea02a8387ce46a05be2b1a902a021d37a
@@@ -465,7 -465,7 +466,7 @@@ F ext/userauth/userauth.c 7f00cded7dcaa
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk 723543d76167bf302cfc905d0267f6b6a0ab922bf77add04e1099c7766cb056f
 -F main.mk d1654e2923a7195603a7d6564dabe037a3a20ea5b3817002db534ffc4ad8cecf
++F main.mk 205ddbb953bb068fb5f198ea85b387f92ce0a18b082ac493b178608368de9432
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@@ -477,38 -477,38 +478,38 @@@ F spec.template 86a4a43b99ebb3e75e6b9a7
  F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
  F sqlite3.1 fc7ad8990fc8409983309bb80de8c811a7506786
  F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
- F src/alter.c 2eab8b2c245ee6a4df55f597a1e39c0780518aad48a81cf5594b4dee5e0d678c
 -F src/alter.c df53c39fd4f32528fc7ad8188b3bf2b506e1a8b3bb975b14f16a1bc6e901950f
 -F src/analyze.c 01c6c6765cb4d40b473b71d85535093730770bb186f2f473abac25f07fcdee5c
 -F src/attach.c a514e81758ba7b3a3a0501faf70af6cfc509de8810235db726cfc9f25165e929
++F src/alter.c a5f129de5a965d65a246bf6870cae49886b78b1df6b3b4386864c0fe890b8c2d
 +F src/analyze.c 8b522a57784406d75f544e6d67f3fe7a7196702d3d954b7678bb4b4fe789e5a4
- F src/attach.c d176b64d15dfcb08ebd7b11d77cac1d5b08d4ec1e8bd9b59e2f0a84557f95ac9
++F src/attach.c 74fab1b71a5fef866eae143aa5fa8c66174a4aa5829189764948e621ad3adbd6
  F src/auth.c 08954fdc4cc2da5264ba5b75cfd90b67a6fc7d1710a02ccf917c38eadec77853
  F src/backup.c 3014889fa06e20e6adfa0d07b60097eec1f6e5b06671625f476a714d2356513d
  F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
  F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
- F src/btree.c cfd2a37794532d765e235a2550ad2732924a6d06b07a3bc9f6a71750e3b3cca1
+ F src/btree.c 51ba86095316fceb3e25bc61617d673d84627e79f4ace83f8722910f33eedef3
  F src/btree.h 096cc53baa58be22b02c896d1cf933c38cfc6d65f9253c1367ece8cc88a24de5
  F src/btreeInt.h 7bc15a24a02662409ebcd6aeaa1065522d14b7fda71573a2b0568b458f514ae0
- F src/build.c 3a2960f823d1c1b8a379cbf9024e5fd45391db95caa7fbe9dd0dc2452ce36b2d
 -F src/build.c daeb1beb04e3729456f095686bc26bb0cde026263fc281257d431ba22c2e7f21
 -F src/callback.c d0b853dd413255d2e337b34545e54d888ea02f20da5ad0e63585b389624c4a6c
++F src/build.c 21108549af05f8ba65c7c244356ed99ac00aae36575989ef7303ff8703bc8291
 +F src/callback.c d8cdf5d697a31cf54a2b64bce9001fe24f3522a566f44c9fe1eb3a0c7e291c56
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
- F src/ctime.c 3552554374bfb39a48f8b0064e11cbcd7f2f5af46bc8136f31f7f79ef3851be5
 -F src/ctime.c 3052b6b05ed9ef547a3dd66b8e01bfa9d582e78752ad6ed327da84652641e038
++F src/ctime.c 1ee55d93b848c88b1a333a19e923b58e1bb328d95edb5bc5be9cc94794c6998d
  F src/date.c e0632f335952b32401482d099321bbf12716b29d6e72836b53ae49683ebae4bf
  F src/dbpage.c 8a01e865bf8bc6d7b1844b4314443a6436c07c3efe1d488ed89e81719047833a
  F src/dbstat.c 3aa79fc3aed7ce906e4ea6c10e85d657299e304f6049861fe300053ac57de36c
  F src/delete.c 73f57a9a183532c344a3135cf8f2a5589376e39183e0b5f562d6b61b2af0f4d8
- F src/expr.c d681f0b48b1e16173ad8e1e8f7323cda120a0c517cb7a3d5b329c4e2c57f18bd
+ F src/expr.c c56c74d40d1ca5359177f1425d2eb2aa050c30da0b49e014da1f109aa38ece0f
  F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 -F src/fkey.c e9063648396c58778f77583a678342fe4a9bc82436bf23c5f9f444f2df0fdaa4
 +F src/fkey.c 6dcbab4ead1dbfdc19da70a8650e5734a5124765f75fb840100117a7a45980d2
- F src/func.c 479f6929be027eb0210cbdde9d3529c012facf082d64a6b854a9415940761e5e
- F src/global.c ed55af196a9b66e198aaeda3f5454c3aa7d7d050c6c938181fd044b70d180a81
+ F src/func.c 88fd711754a7241cb9f8eb1391370fd0c0cea756b3358efa274c5d1efd59af93
+ 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 e36be69e3810902eaf7e171260c885bc9547b1d41616c868f1cc46e6a0a3b7fd
+ F src/insert.c 2189e0e596010a0dc5405d9f14f78db1ee2fa71138c931f5b6ea96610b95bfc1
  F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
  F src/loadext.c 8c9c8cd2bd8eecdb06d9b6e89de7e9e65bae45cc8fc33609cc74023a5c296067
- F src/main.c 05b648d678f1d4834628b6e76c692f5fa23f4860a0d1205a195944ca73dd2b21
- F src/malloc.c c1af4ac5a463648cd2953fd4ac679b3ba9022ce5ec794a60806150ad69dfd33a
 -F src/main.c 2b2044221a10e7c5f49a98f50563ce9a944511241ba5946d1754dcc2a7437a07
++F src/main.c 10ebcd51909c0d567d67a50bd7acc56c598c8c5b0f79cc80feec273b69662ab0
+ F src/malloc.c cbc93cdd429c4594912017d92ab656e2579aca64dbd1c6888551275bed46f25b
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
  F src/mem2.c b93b8762ab999a29ae7751532dadf0a1ac78040308a5fb1d17fcc365171d67eb
@@@ -536,24 -536,24 +537,24 @@@ F src/parse.y ac294bd2891c4310b0b23a67e
  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 d778af9986f3b0107c5b255dcfe2696e8e99e00fb77c5115bbfea4e92c3302e7
 +F src/pragma.c 300dcb000f9ac0ac35c913f5e232234275e5007d25147a6915e4ae06b4afd662
 +F src/pragma.h ce2b135cde481eeb198af0dfc4781d58528ce80b17580a2b747b8fd4bc969e44
- F src/prepare.c c8797eefce2ae0249ff595c2f3626c4ce88bafe7135e417c4db4db046b0470de
- F src/printf.c 2b03a80d7c11bb422115dca175a18bf430e9c9dbaa0eee63b758f0c022f8f34f
++F src/prepare.c e5605f4dacd42b12d2f65dc6a7c270802f50291051993bab378c58c7a86d15bd
+ F src/printf.c 78fabb49b9ac9a12dd1c89d744abdc9b67fd3205e62967e158f78b965a29ec4b
  F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
- F src/resolve.c dd47248c2c914feb0d4428c27d782e2723971d32cfa5536f49306d080df4d45a
+ F src/resolve.c 40e216d9a72e52841a9c8e0aec7d367bade8e2df17b804653b539b20c1ab5660
  F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
- F src/select.c 734cf12e42f81f2fe461e41214e6552375e55b62a802784a4f0066ac592e7f4a
- F src/shell.c.in 8f658734fb8b7205c20f6b0bf7d02886887df60000d261f0c0b478511f4b6cd7
- F src/sqlite.h.in 0144aeddd6f44ffddfcf965f6dd3983865830d2db3fe73a856874b28cd40765e
+ F src/select.c 8f9ecc60f9ffb5954f726d2adf5722c638072260838490d0349e71d2e4a31822
 -F src/shell.c.in 1b32ba2918ede13b68df47c7b92b72ba0d06e68d384e78bb9d7456527271d400
 -F src/sqlite.h.in 5c950066775ca9efdaa49077c05d38d0bef6418f3bd07d2dce0210f1d2f3c326
++F src/shell.c.in 7e77a4fcef4b980e767abb3fbe148408300bba791ba420dd82a2d83a26c243be
++F src/sqlite.h.in 894e5ea7b3c8f8331cd132492a1c9c56c02c9b9719442c3169fca560bdec32f9
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 61b38c073d5e1e96a3d45271b257aef27d0d13da2bea5347692ae579475cd95e
- F src/sqliteInt.h 452b2b8dfa969ccac6fab8d1cff04967e5e9cb7362de152cbb5a9872ae6644fb
 -F src/sqliteInt.h 6d0c49ed218f9f6ffabfdc8bed1a5de89f61e70c96a62156aeebeb20c1be9bf0
++F src/sqliteInt.h 13f8b7f204c7e51dd7a4d120a264d2e2d766494e6fafb8f2a91a723f25f190f2
  F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
 -F src/status.c 4b8bc2a6905163a38b739854a35b826c737333fab5b1f8e03fa7eb9a4799c4c1
 +F src/status.c d0956e57c71160155f620a3efeb1e5c05a3f8b9a897dd09c5263268e5d237579
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
- F src/tclsqlite.c f4dd32d001c2be33371dca87e30117352f02dad59a2e5428c97f08703360a169
- F src/test1.c cff43d8e21be543b77651b4d2caf49bd6488fee220f8540ecd9f71d13169dbd1
 -F src/tclsqlite.c 97645e4a15dde6a6ad6de8d81057ff9869413b866015a89e208fedacd709493e
++F src/tclsqlite.c 5642a5fd32de2cebdb739c8f3ec5af5582939b20fd7ae1802a4f97098312d273
+ F src/test1.c 2100f4c28bae21ce83a9a0c5ec6827efd0e15d11b93b569b614daa5654b3fcf6
  F src/test2.c 3efb99ab7f1fc8d154933e02ae1378bac9637da5
  F src/test3.c 61798bb0d38b915067a8c8e03f5a534b431181f802659a6616f9b4ff7d872644
  F src/test4.c 7c4420e01c577b5c4add2cb03119743b1a357543d347773b9e717195ea967159
@@@ -568,7 -568,7 +569,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 c7625911811828ba7065c4c789d68a61835f42239d5bd7f4a08aba7c44ccded9
 -F src/test_config.c 9c8e12823c46082a01765addf43be9309889f4e9dfb5a512a6c974e1c4efb413
++F src/test_config.c ec23c06759a2911c1d4e5464cfe4301b83de117475beb4a7d13a7c159c56c136
  F src/test_delete.c e2fe07646dff6300b48d49b2fee2fe192ed389e834dd635e3b3bac0ce0bf9f8f
  F src/test_demovfs.c 86142ba864d4297d54c5b2e972e74f3141ae4b30f05b3a95824184ed2d3d7f91
  F src/test_devsym.c aff2255ea290d7718da08af30cdf18e470ff7325a5eff63e0057b1496ed66593
@@@ -608,34 -607,34 +609,34 @@@ F src/test_windirent.h 90dfbe95442c9762
  F src/test_window.c cdae419fdcea5bad6dcd9368c685abdad6deb59e9fc8b84b153de513d394ba3f
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
- F src/tokenize.c 8cf83b4b95d09c949e2e4d8f99c0f4bcd955436ef28164f4d4b5f334edaca176
- F src/treeview.c c6260e1fa5f41c361b2409edc9b0050bcaef5bc4d6abc467fbc45f0d7ccf3d84
- F src/trigger.c ba829071464b07ab763e5226353637aa9b0235ca77aea744825479dceaca728e
- F src/update.c 0f5a61f0787199983530a33f6fffe4f52742f35fcdf6ccfad1078b1a8bc17723
 -F src/tokenize.c bae853ad129d1129c063de8630a3e99e306283bc40146f359b1bb91be2c08f1e
++F src/tokenize.c 9495a8272c339a330071d0078a85d1e2f36d1f4c39306495c2b080a2350060e1
+ F src/treeview.c e483aeedf6f207000db1f90eb6abd816350493314c30e8749d319bdb9ab3b08c
 -F src/trigger.c e0fd347b2571a2d956318cdc6d011ccca7ce862d10a0ca04188a37920ef5440c
++F src/trigger.c ebb7d641c9ffb7df421407938f03b6d0dea819e267c9e35449391680f400658d
+ F src/update.c 56fa0458b1ffc1042629f926443e8ed44203983df3ab2b0db2ba556e6ceed68c
  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/vdbe.h 25dabb25c7e157b84e59260cfb5b466c3ac103ede9f36f4db371332c47601abe
 +F src/vacuum.c 724188c5afbba905b310e8d8e78530956d16e6d60a3ba8a1105d05732d7d8601
- F src/vdbe.c 6d43029157d517ce761c4902d2b543fb8d537dfdd7a8561f95cbe0dd21d4a04d
++F src/vdbe.c 2e9552a692c331b625a2c0931a92b7fd8a6ed417f26b90db8485ba495a16949f
 +F src/vdbe.h bfde0b0f429a0ba4203e5319780a6a1c8b2a809c5cd6baa9ae22e257a657b8b3
- F src/vdbeInt.h 000d9ab1ea4cb55a80de15e28f3f595645b4fddef34bca4347fb3db8031d9041
- F src/vdbeapi.c 4a43e303ec3354c785f453e881521969378e85628278ab74ba4a9df790c0d93b
- F src/vdbeaux.c 0e12765d38149f203a8e2dc9a79411df0bfa8c0d066acd3b8125effba8009522
- F src/vdbeblob.c 40028e015fe557a945c99edb6cbf844ea96d853c3e8ac4eb5c1e49bff59f154e
- F src/vdbemem.c 947f2a65910edb4014dc981d33e414a68c51f169f9df8c4c493a0ba840b6eb1f
+ F src/vdbeInt.h 58980223a32495ad059d10581b83e133abdc77248b1bab85c080cab8a13bd819
+ F src/vdbeapi.c d9e99daf59fec928986838b3389a7337e82fec6b3b5de30206cb99fb4661b94e
 -F src/vdbeaux.c 065a10392378109f08435bd50d03dff315e384cde2831d6b8dbaec05f33b10af
 -F src/vdbeblob.c c6b8db50b227f66fb404215732068df76485b5b433e5f9d4d9ac27410b218193
++F src/vdbeaux.c da8c06b87ff71a25a2eace72721f4506bd8a2bab87828413dbf33c77b8326f44
++F src/vdbeblob.c 3356ecdb98661972977744bb5c66c9cc02c0fc512267e749949b6d8b792dabe4
+ F src/vdbemem.c 175c73ced03edbb0f6567a41c8032afaeb83372090fa7bddfc88a67e28da2b8a
  F src/vdbesort.c f5b5e473a7cee44e47a94817b042fd7172cf3aa2c0a7928a8339d612bcfdec5a
  F src/vdbetrace.c 666c6fd9f1b62be6999e072a45b913e3c2c3518bc60dfd4d54fe304130acb724
  F src/vdbevtab.c f99b275366c5fc5e2d99f734729880994ab9500bdafde7fae3b02d562b9d323c
- F src/vtab.c b194210339673cf8a60285f1d87ef2a8055eff32782375ffec842fc6bbacc41a
 -F src/vtab.c b928405ccb66040fc6c3a11eaa93ddb02cbf20f9ab6860b301b222b9b50dc089
++F src/vtab.c b567ce416e332442ec51ccc7f1ac6059d1e32058cdfc8bceaf57d39b4150b094
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
- F src/wal.c 69e770e96fd56cc21608992bf2c6f1f3dc5cf2572d0495c6a643b06c3a679f14
+ F src/wal.c c8ec20a1ca161d5635a4f19c2a4efec2e006e19a8a61f272bf6bce1c80ab7436
  F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
- F src/walker.c d42d6c80ea363ef689a462e65eefcfe87deab924c50de5baa37ecb6af7d7ddaa
- F src/where.c 10d06b16670a1d2a992d52a9f08e49426d38a08fb0a7ae5f7f62fd023d560e1e
- F src/whereInt.h 446e5e8018f83358ef917cf32d8e6a86dc8430113d0b17e720f1839d3faa44c4
- F src/wherecode.c e57a8690311a75d06e723e8d379f9831de04aba300e07174d236e32a7f9c7a13
- F src/whereexpr.c 53452fe2fb07be2f4cb17f55cc721416fae0092c00717f106faf289c990b6494
- F src/window.c 7e89ac4b6cd6bb9b7772234a625d19c39b530f4ac06e43688a8b7e6a1ab512a2
+ 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
@@@ -1293,20 -1293,13 +1295,20 @@@ F test/recover.test ccb8c2623902a92ebb7
  F test/regexp1.test 497ea812f264d12b6198d6e50a76be4a1973a9d8
  F test/regexp2.test 40e894223b3d6672655481493f1be12012f2b33c
  F test/reindex.test cd9d6021729910ece82267b4f5e1b5ac2911a7566c43b43c176a6a4732e2118d
- F test/releasetest.tcl fb76d8fcc95ac29d6356cd9e52b726ab9e43a24082897618dfbcb7c2b0049153 x
- F test/releasetest_data.tcl 3d41ddb3f04f474ac9d925485da24ce6576ff0ebc4c7201c8a340bc09846c261
+ F test/releasetest.tcl 6f803ef0b896f8f3f4c26eb072c0399963a5987a509a64d45f5dfbc1ebae2951 x
+ F test/releasetest_data.tcl f88ed29aa18366ed3956ace36c96ec6868ef5b9ee04cc05d32f4d81031e19e28
  F test/resetdb.test 8062cf10a09d8c048f8de7711e94571c38b38168db0e5877ba7561789e5eeb2b
  F test/resolver01.test f4022acafda7f4d40eca94dbf16bc5fc4ac30ceb
- F test/returning1.test 209b910c132cb2015bb1159f852c7124778004963c09095c42c3d2442110c56c
+ F test/returning1.test 52b4ed60f104a4ce85b38417e5319b2078b2b908c71a768d539cee3c0ce8bdc9
 +F test/reuse1.test faa2ce5ff566d936b8a10d9e22ba2ee66a54ce89fdcf8aef561df6b15b0ff3d3
 +F test/reuse2.test 5dd9c98579358f0d5a90d25e36dd6e678a03e23446b6c7f2630a8da22ae7ca94
 +F test/reuse3.test 876d15c42d61b1f6ab718cd8169912514ad314d7fe1cd9788080aa62168ba0d1
 +F test/reuse4.test adaad66253aea6cc748674328abe69b650c5c78b8676ed1162d3de09742519f9
 +F test/reuse5.test bbe6cf7384ef90f134392edd93d626385ef0bf6f40eefc3d993535cd0861d83b
 +F test/reuse6.test f4674f9967aee2a0b49c02832120b8b495291c0d87aae084c54e6c0cc18132fe
 +F test/reusefault.test ef646a0fb51d50ddfb4b7cd872f88e7d36eaba64bde7797b3418c3774e1c8d14
  F test/rollback.test 06680159bc6746d0f26276e339e3ae2f951c64812468308838e0a3362d911eaa
- F test/rollback2.test bc868d57899dc6972e2b4483faae0e03365a0556941474eec487ae21d8d38bb6
+ F test/rollback2.test 3f3a4e20401825017df7e7671e9f31b6de5fae5620c2b9b49917f52f8c160a8f
  F test/rollbackfault.test 0e646aeab8840c399cfbfa43daab46fd609cf04a
  F test/round1.test 768018b04522ca420b1aba8a24bd76091d269f3bce3902af3ec6ebcee41ab21e
  F test/rowallock.test 3f88ec6819489d0b2341c7a7528ae17c053ab7cc
@@@ -1468,8 -1461,9 +1470,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 e58f0e1b6a3e4ccb24f831650c296e800f6299cc258793f6fc372591f416cb93
  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
@@@ -1639,15 -1633,14 +1642,15 @@@ F test/triggerD.test 8e7f3921a92a5797d4
  F test/triggerE.test 612969cb57a4ef792059ad6d01af0117e1ae862c283753ffcc9a6428642b22ee
  F test/triggerF.test 5d76f0a8c428ff87a4d5ed52da06f6096a2c787a1e21b846111dfac4123de3ad
  F test/triggerG.test 2b816093c91ba73c733cfa8aedcc210ad819d72a98b1da30768a3c56505233e9
- F test/triggerupfrom.test d25961fa70a99b6736193da7b49a36d8c1d28d56188f0be6406d4366315cd6e4
+ F test/triggerupfrom.test d1f9e56090408115c522bee626cc33a2f3370f627a5e341d832589d72e3aa271
  F test/trustschema1.test 4e970aef0bfe0cee139703cc7209d0e0f07725d999b180ba50770f49edef1494
 -F test/tt3_checkpoint.c 9e75cf7c1c364f52e1c47fd0f14c4340a9db0fe1
 -F test/tt3_index.c 39eec10a35f57672225be4d182862152896dee4a
 -F test/tt3_lookaside1.c 0377e202c3c2a50d688cb65ba203afeda6fafeb9
 +F test/tt3_checkpoint.c 9a7fe00e07700af027769d83ef67ab727927ae6c865ecdc71fe8011194200c53
 +F test/tt3_index.c 95592839426dc85ce5a7a57b41be2cbf3c2ec3457b9cd841a06ed5877f712c7c
 +F test/tt3_lookaside1.c 2ddd99bfffeef288f0786827ef68f912f6f47ce3d3184e62f05808d8e13b920e
 +F test/tt3_reuseschema.c 4d52e141f89f009028d8ab0bd1f0697d0edffa94bafc1fff0f7ad4d9d9baa549
  F test/tt3_shared.c b37d22defc944a2ac4c91c927fd06c1d48cd51e2ce9d004fe868625bd2399f93
 -F test/tt3_stress.c f9a769ca8b026ecc76ee93ca8c9700a5619f8e51c581107c4053ba6ac97f616f
 -F test/tt3_vacuum.c 1753f45917699c9c1f66b64c717a717c9379f776
 +F test/tt3_stress.c 077e817ac1168443b075fedb44e92db84bb4dc5bd3b6fe1aba25c94ac280b231
 +F test/tt3_vacuum.c ca42adcf8a671abbe34338b828464269e21758a6b4857b889dabfd39a3206d98
  F test/types.test bf816ce73c7dfcfe26b700c19f97ef4050d194ff
  F test/types2.test 1aeb81976841a91eef292723649b5c4fe3bc3cac
  F test/types3.test 99e009491a54f4dc02c06bdbc0c5eea56ae3e25a
@@@ -1851,9 -1845,9 +1855,9 @@@ F tool/mkctimec.tcl 06b0d503ee0e6c2d4ab
  F tool/mkkeywordhash.c 08b6e4d7a482a7f37a9a0032e7ba968e26624a027b6b2e9ba589be6f5e3d8c2c
  F tool/mkmsvcmin.tcl 6ecab9fe22c2c8de4d82d4c46797bda3d2deac8e763885f5a38d0c44a895ab33
  F tool/mkopcodec.tcl d1b6362bd3aa80d5520d4d6f3765badf01f6c43c
- F tool/mkopcodeh.tcl 352a4319c0ad869eb26442bf7c3b015aa15594c21f1cce5a6420dbe999367c21
+ F tool/mkopcodeh.tcl acc798757e2c60e4b6e16745505b9595fca76c206815c8ada576a136cf3608ed
  F tool/mkopts.tcl 680f785fdb09729fd9ac50632413da4eadbdf9071535e3f26d03795828ab07fa
 -F tool/mkpragmatab.tcl ae5585ae76ca26e4d6ccd5ea9cdebaf5efefb318bf989497a0e846cd711d9ab1
 +F tool/mkpragmatab.tcl 37381569b5a5cd3269e3fdbc08829eb1a5f7c2a8e59ee7be8995127e5ef99e0d
  F tool/mkshellc.tcl 70a9978e363b0f3280ca9ce1c46d72563ff479c1930a12a7375e3881b7325712
  F tool/mksourceid.c 36aa8020014aed0836fd13c51d6dc9219b0df1761d6b5f58ff5b616211b079b9
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
@@@ -1920,7 -1914,7 +1924,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 76f19f4bcfc0228df669c89e0676845e98bbfe161d77b4573d6db513b751a8ca
- R 698e1d2b44db999fc94a657fc45939d2
 -P 240f7494bfa3e0806ae2f971e78039c62a419de647cb9e807309f90e1d2a536d
 -R 04449523789f74442d2ffc6328882af8
++P e69f29892e5226957578b06e9f7966a8e820fc72c0a8b0a83773fb168caa500f c18dbe2f389f4ba7b219b7995d4f7009d1bc249ef8f93a30b262c6d2c008319d
++R 242cb57b68b557f8cbd908cf0c13b86b
  U dan
- Z 88361c60553e914251bdac4fd8bdc973
 -Z d5a4a247a6ed6e80155854d3f3c040e4
++Z 75d80add83f649ef62ad4701836608da

diff --cc manifest.uuid
index d65ed01d58c20d0518da5aa97f89e06aa2de6795,f9a0787a4495011f2a14e8a0e9b7291ca07fadf8..f5bd864265e028e9a3b31a856c0203f7e3c104f4
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- e69f29892e5226957578b06e9f7966a8e820fc72c0a8b0a83773fb168caa500f
 -c18dbe2f389f4ba7b219b7995d4f7009d1bc249ef8f93a30b262c6d2c008319d
++dbc65a695877306e2add75aba2a279efbb30bfadb5339883cf74aa417f11de86

diff --cc src/alter.c
Simple merge

diff --cc src/attach.c
Simple merge

diff --cc src/build.c
Simple merge

diff --cc src/ctime.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/prepare.c
Simple merge

diff --cc src/shell.c.in
index 03b72a8d161311550dd5d273b4b2e08e34076bd9,462cd717baf83e1a3875ae166dca1ed30dc5ac08..944ee2d5627b4cb3ebbb29c2eb06423f0a2cdf35
--- 1/src/shell.c.in
--- 2/src/shell.c.in
+++ b/src/shell.c.in
@@@ -8953,11 -8710,9 +8953,11 @@@ static int do_meta_command(char *zLine
          p->openMode = SHELL_OPEN_APPENDVFS;
        }else if( optionMatch(z, "readonly") ){
          p->openMode = SHELL_OPEN_READONLY;
 +      }else if( optionMatch(z, "sharedschema") ){
 +        p->openMode = SHELL_OPEN_SHAREDSCHEMA;
        }else if( optionMatch(z, "nofollow") ){
          p->openFlags |= SQLITE_OPEN_NOFOLLOW;
- #ifdef SQLITE_ENABLE_DESERIALIZE
+ #ifndef SQLITE_OMIT_DESERIALIZE
        }else if( optionMatch(z, "deserialize") ){
          p->openMode = SHELL_OPEN_DESERIALIZE;
        }else if( optionMatch(z, "hexdb") ){

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

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/tclsqlite.c
Simple merge

diff --cc src/test_config.c
Simple merge

diff --cc src/tokenize.c
Simple merge

diff --cc src/trigger.c
index 4d6f359f6549ae3e07a00d045a46a920c16a00d9,90e6ef4a727ad9b1422a56662a04e6e34981f1a9..8ab4b73411a202444a55c452879bcae9acb93bef
--- 1/src/trigger.c
--- 2/src/trigger.c
+++ b/src/trigger.c
@@@ -52,49 -52,46 +52,67 @@@ Trigger *sqlite3TriggerList(Parse *pPar
    Trigger *pList;           /* List of triggers to return */
    HashElem *p;              /* Loop variable for TEMP triggers */
  
++#ifdef SQLITE_ENABLE_SHARED_SCHEMA
++  char *zSchema = 0;
++  sqlite3 *db = pParse->db;
++  if( IsSharedSchema(db) ){
++    zSchema = db->aDb[sqlite3SchemaToIndex(db, pTab->pSchema)].zDbSName;
++  }
++#endif
++
    if( pParse->disableTriggers ){
      return 0;
    }
    pTmpSchema = pParse->db->aDb[1].pSchema;
    p = sqliteHashFirst(&pTmpSchema->trigHash);
-   if( p==0 ){
-     return pTab->pTrigger;
-   }
    pList = pTab->pTrigger;
-   if( pTmpSchema!=pTab->pSchema ){
-     sqlite3 *db = pParse->db;
- #ifdef SQLITE_ENABLE_SHARED_SCHEMA
-     char *zSchema = 0;
-     if( IsSharedSchema(db) ){
-       zSchema = db->aDb[sqlite3SchemaToIndex(db, pTab->pSchema)].zDbSName;
-     }
- #endif
-     assert( sqlite3SchemaMutexHeld(db, 0, pTmpSchema) );
-     while( p ){
-       Trigger *pTrig = (Trigger *)sqliteHashData(p);
+   while( p ){
+     Trigger *pTrig = (Trigger *)sqliteHashData(p);
 -    if( pTrig->pTabSchema==pTab->pSchema
++
++    int bSchemaMatch;
 +#ifdef SQLITE_ENABLE_SHARED_SCHEMA
-       if( ( (zSchema==0 && pTrig->pTabSchema==pTab->pSchema)
-          || (zSchema!=0 && 0==sqlite3StrICmp(pTrig->zTabSchema, zSchema)) 
-           ) && 0==sqlite3StrICmp(pTrig->table, pTab->zName)
-       ){
- #else 
-       if( pTrig->pTabSchema==pTab->pSchema
-        && 0==sqlite3StrICmp(pTrig->table, pTab->zName)
-       ){
++    if( zSchema ){
++      /* Shared-schema */
++      bSchemaMatch = (0==sqlite3StrICmp(pTrig->zTabSchema, zSchema));
++    }else
 +#endif
-         pTrig->pNext = pList;
-         pList = pTrig;
-       }else if( pTrig->op==TK_RETURNING ){
-         assert( pParse->bReturning );
-         assert( &(pParse->u1.pReturning->retTrig) == pTrig );
-         pTrig->table = pTab->zName;
-         pTrig->pTabSchema = pTab->pSchema;
-         pTrig->pNext = pList;
-         pList = pTrig;
-       }        
-       p = sqliteHashNext(p);    
++    {
++      /* Non-shared-schema */
++      bSchemaMatch = (pTrig->pTabSchema==pTab->pSchema);
 +    }
++
++    if( bSchemaMatch
+      && pTrig->table
+      && 0==sqlite3StrICmp(pTrig->table, pTab->zName)
+      && pTrig->pTabSchema!=pTmpSchema
+     ){
+       pTrig->pNext = pList;
+       pList = pTrig;
+     }else if( pTrig->op==TK_RETURNING
+ #ifndef SQLITE_OMIT_VIRTUALTABLE
+               && pParse->db->pVtabCtx==0
 -#endif
++#endif 
+     ){
+       assert( pParse->bReturning );
+       assert( &(pParse->u1.pReturning->retTrig) == pTrig );
+       pTrig->table = pTab->zName;
+       pTrig->pTabSchema = pTab->pSchema;
+       pTrig->pNext = pList;
+       pList = pTrig;
+     }        
+     p = sqliteHashNext(p);    
+   }
+ #if 0
+   if( pList ){
+     Trigger *pX;
+     printf("Triggers for %s:", pTab->zName);
+     for(pX=pList; pX; pX=pX->pNext){
+       printf(" %s", pX->zName);
+     }
+     printf("\n");
+     fflush(stdout);
    }
+ #endif
    return pList;  
  }
  
@@@ -1093,9 -1106,7 +1137,9 @@@ static TriggerPrg *codeRowTrigger
    Parse *pSubParse;           /* Parse context for sub-vdbe */
    int iEndTrigger = 0;        /* Label to jump to if WHEN is false */
  
-   assert( pTrigger->zName==0 || pTab==tableOfTrigger(pTrigger)
-        || IsSharedSchema(pParse->db)
 -  assert( pTrigger->zName==0 || pTab==tableOfTrigger(pTrigger) );
++  assert( pTrigger->zName==0 || IsSharedSchema(pParse->db)
++      || pTab==tableOfTrigger(pTrigger)
 +  );
    assert( pTop->pVdbe );
  
    /* Allocate the TriggerPrg and SubProgram objects. To ensure that they
@@@ -1203,9 -1214,7 +1247,9 @@@ static TriggerPrg *getRowTrigger
    Parse *pRoot = sqlite3ParseToplevel(pParse);
    TriggerPrg *pPrg;
  
-   assert( pTrigger->zName==0 || pTab==tableOfTrigger(pTrigger) 
-        || IsSharedSchema(pParse->db)
 -  assert( pTrigger->zName==0 || pTab==tableOfTrigger(pTrigger) );
++  assert( pTrigger->zName==0 || IsSharedSchema(pParse->db)
++      || pTab==tableOfTrigger(pTrigger) 
 +  );
  
    /* It may be that this trigger has already been coded (or is in the
    ** process of being coded). If this is the case, then an entry with

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeaux.c
Simple merge

diff --cc src/vdbeblob.c
Simple merge

diff --cc src/vtab.c
Simple merge