From: drh <>
Date: Thu, 21 Oct 2021 14:10:04 +0000 (+0000)
Subject: Merge recent trunk enhancements into the reuse-schema branch
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b963701038471c84d0775406aa67fbd93befcef6;p=thirdparty%2Fsqlite.git

Merge recent trunk enhancements into the reuse-schema branch

FossilOrigin-Name: cd15fc3c08373dad63ba7eafb117d0d09913b8fc339882fd909da5ec485a7138
---

b963701038471c84d0775406aa67fbd93befcef6
diff --cc manifest
index bfb38b6ed4,f4a1eebc38..8564c9aef3
--- a/manifest
+++ b/manifest
@@@ -1,11 -1,11 +1,11 @@@
- C Merge\srecent\strunk\senhancements\sinto\sthe\sreuse-schema\sbranch.
- D 2021-10-04T11:49:35.957
 -C Fix\san\sincorrect\sJSON\sassert()\sthat\swas\sadded\s5\sdays\sago\sby\scheck-in\s[7b8ea2298927fd34].
 -D 2021-10-20T20:22:37.259
++C Merge\srecent\strunk\senhancements\sinto\sthe\sreuse-schema\sbranch
++D 2021-10-21T14:10:04.197
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
- F Makefile.in c5fd8f6f963de95afe68340d98708bc6043b71a8f0edf7d76a1ccbc4be3c6cc7
 -F Makefile.in 457a0f10540bd18a700c9d45add8dcc06e040bc9d1e948c9816b9b6eab1de384
++F Makefile.in 6ebd57693c85fecfee83ad5982eea3f50049420425bcb405b02796595b2dfbc8
  F Makefile.linux-gcc f609543700659711fbd230eced1f01353117621dccae7b9fb70daa64236c5241
- F Makefile.msc 9a5844f43ca9dcc792d036c86b501d8aa9d8fe14ef48ce1ce355f5eacc55f887
 -F Makefile.msc fef1e54f1a2138aa2de79ad8a928f1711106d082e6a35cdfbbfec9e8fd0c59c3
++F Makefile.msc 71ac2d75fa1a49bd0f7b3306982d64e69b100a61724b847a8af1e610aa3eec6e
  F README.md 27fb76aa7eb57ed63a53bbba7292b6bf71f51125554f79f16b5d040edd1e6110
  F VERSION c6595fef606851f2bc3ebed6a7386c73751835fc909feab7c093739fa4b3c1d1
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -484,37 -483,37 +484,37 @@@ F spec.template 86a4a43b99ebb3e75e6b9a7
  F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
  F sqlite3.1 fc7ad8990fc8409983309bb80de8c811a7506786
  F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
- F src/alter.c aa59bacdcd7716eae842999467542f3bf14e73a691e9462acdb3217151de96aa
- F src/analyze.c 352b3db73a36d3ddd26c511e9d913787adaabb1aa068589601512cfd9b0f49c0
- F src/attach.c 74fab1b71a5fef866eae143aa5fa8c66174a4aa5829189764948e621ad3adbd6
 -F src/alter.c d6b32481211fd5628b31d86329df6434bfc92e3372b53215339dc8cb47408644
 -F src/analyze.c 7518b99e07c5494111fe3bd867f28f804b6c5c1ad0703ec3d116de9bab3fa516
 -F src/attach.c e3f9d9a2a4a844750f3f348f37afb244535f21382cbfcd840152cb21cb41cfaf
++F src/alter.c 019ec1f683685a685d7cf0e82673b2ad91de9f1895537e397b0168e6470a17e9
++F src/analyze.c b619f92ad33aa38c234d9620f576bceef56465088ed37f28c56d136a15c1a909
++F src/attach.c 173d0cadb5eeee2c5ac59400955a821fd80095bb248e21c99194dc84cc214078
  F src/auth.c f4fa91b6a90bbc8e0d0f738aa284551739c9543a367071f55574681e0f24f8cf
  F src/backup.c 3014889fa06e20e6adfa0d07b60097eec1f6e5b06671625f476a714d2356513d
- F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
+ F src/bitvec.c 7c849aac407230278445cb069bebc5f89bf2ddd87c5ed9459b070a9175707b3d
  F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
- F src/btree.c ced03fe226a3a42b77b504afcd0a9da14da39b42fac5935988243803cf03bc14
+ F src/btree.c 0604f4af97624ffbe2f0757c559c51f57760c6ad3d8ee3ee94fa6ec5795f2832
  F src/btree.h 74d64b8f28cfa4a894d14d4ed64fa432cd697b98b61708d4351482ae15913e22
- F src/btreeInt.h 7bc15a24a02662409ebcd6aeaa1065522d14b7fda71573a2b0568b458f514ae0
- F src/build.c 034d67c88857fc3014c64e4cb95eaa26710e8bdab6ef15fc610bd776075a319b
- F src/callback.c 38b73a7a594b5b9fd322acf0a7a0e614bbc9a2edaecab437eb1d8b6d79afba3b
+ F src/btreeInt.h ee9348c4cb9077243b049edc93a82c1f32ca48baeabf2140d41362b9f9139ff7
 -F src/build.c 8bdda90f9b1189c7b0813575171b3c6b2d74b3ade57c11cb4383776781ea9335
 -F src/callback.c 106b585da1edd57d75fa579d823a5218e0bf37f191dbf7417eeb4a8a9a267dbc
++F src/build.c 32f007fedbf4352a8f534f9598c4a6537ede4c52efa32b42ecf91ea52d45aa6f
++F src/callback.c a3449287e62b63ac7edee94175a4db5fa56a0fbfc48fa463d8222a952af2966a
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
 -F src/ctime.c 8159d5f706551861c18ec6c8f6bdf105e15ea00367f05d9ab65d31a1077facc1
 +F src/ctime.c 22b5ea591c18d677b521a99d375dfc626917bc23786c5f52aca113924b8edb9e
- F src/date.c 467848d8187382764e37fd7678d6825cdfb90d9e564648527ed832e999ea7b85
+ F src/date.c fa928630fecf1d436cdc7a7a5c950c781709023ca782c21b7a43cc7361a9451e
  F src/dbpage.c 8a01e865bf8bc6d7b1844b4314443a6436c07c3efe1d488ed89e81719047833a
  F src/dbstat.c 861e08690fcb0f2ee1165eff0060ea8d4f3e2ea10f80dab7d32ad70443a6ff2d
- F src/delete.c 3ce6af6b64c8b476de51ccc32da0cb3142d42e65754e1d8118addf65b8bcba15
- F src/expr.c ebc76aa98b9bcd556c2855942c18f4d2f52c6504c13f7285413026bdd1c7bbf5
+ F src/delete.c 0c151975fa99560767d7747f9b60543d0093d9f8b89f13d2d6058e9c83ad19e7
+ F src/expr.c 529f7eca2821e874a375b1b318e697d62cb28f56069677c93f587f2de5dceb54
  F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
- F src/fkey.c 1905af1821b88321e1bb9d6a69e704495b6844a9b6c29398d40117cc251e893c
- F src/func.c 761a989e9b6a1f03cae05ef274f30881cb8f7ec816af2913b58dc18ac31ffd0e
- F src/global.c 612ea60c9acbcb45754c2ed659b4a56936a06814718e969636fedc7e3b889808
+ F src/fkey.c 187b67af20c5795953a592832c5d985e4313fe503ebd8f95e3e9e9ad5a730bb5
+ F src/func.c 1cfb09d7ffca81238eccefdb0293e1f5b7cfebbd1816dfad5ec6024742a7496b
+ F src/global.c 59bfd5705a623f0b45e91622699953cfd1be2c176e78d8ff610463f2ea4ec51b
  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 16fa4b66709db6db5bb31475f2321d0a839269765aa2461a520c151c385e8b9d
+ F src/insert.c b32e2dcbca838cb8acd4777a59243db4bcea53089e3181b0ea3e4dc75b43aeff
  F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
  F src/loadext.c 0aa9e7f08e168e3874cb54984408e3976dafdf5616d511952c425b5ac088ea3e
- F src/main.c 29777eb1c99214cf12047f139322ef4a491ddf29296236ba94a4bbb1f887077e
 -F src/main.c bfe067d61ebbd0e6eb023f1fb6b353021e621cf1657e061d629064a740bfbf6f
++F src/main.c c1b2bc195d3ea0256106caaf0c8ca3bc4af0e646d658940e3028087553b0d765
  F src/malloc.c ef796bcc0e81d845d59a469f1cf235056caf9024172fd524e32136e65593647b
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
@@@ -543,23 -542,23 +543,23 @@@ F src/parse.y 0bd7971a7489bbf6c3726f1b5
  F src/pcache.c 084e638432c610f95aea72b8509f0845d2791293f39d1b82f0c0a7e089c3bb6b
  F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586
  F src/pcache1.c 54881292a9a5db202b2c0ac541c5e3ef9a5e8c4f1c1383adb2601d5499a60e65
- F src/pragma.c a582bc58a7a05caedbbec3965212ad9343a8369bfdb3017f74672bbf35ee6b00
- F src/pragma.h 482ee258d264738041362e7272fd92a09ad53d926f10b9fa38624befabbec528
 -F src/pragma.c 12760c6ae92a350f5924896644a3e58d969c7c78e346b8cb542f2a8cef7c45d1
 -F src/pragma.h 87330ed2fbfa2a1274de93ca0ab850fba336189228cb256089202c3b52766fad
 -F src/prepare.c 8f07616db04337057b8498b72d051ee90f73c54615c2e908c05404cef1e060b7
++F src/pragma.c 3cd2e0f21563e661b8b16150c95c1b83ca33834afebaca8d19dee54c3de665b3
++F src/pragma.h 270bff5fefbc3c56ddcb5627d706904ec289853a5ef65662f6fac810b5a1923f
 +F src/prepare.c 5251d1bab075470ff6bc2acca05da8e74a3c81b057c52d27adba18e7172b2dc3
  F src/printf.c 5901672228f305f7d493cbc4e7d76a61a5caecdbc1cd06b1f9ec42ea4265cf8d
  F src/random.c 097dc8b31b8fba5a9aca1697aeb9fd82078ec91be734c16bffda620ced7ab83c
- F src/resolve.c b9e60afa56d0484ee573aba54d9e73603736236df33d2ae3421b4cd0367d907d
+ F src/resolve.c ae65c88f5d0d4bc0052b203773d407efa2387c2bd6b202f87178006c7bb8632c
  F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
- F src/select.c 916d18b586d8efad5a46040e48405f42e7f90fff33bca1cfab040169515ec525
- F src/shell.c.in b6f7cd92701d378382acc99bbd226e1e3d0cfbf494ab4c21f28d2a09ffcfddea
- F src/sqlite.h.in 0b54872eca3326d165a807b8f964e1b3026e26f9d28ee7f2aeb852ea2252eea8
+ F src/select.c 32d25b5af6c708aa63373c78c2e59681910387a7a78c08ec3086cadc77d41627
 -F src/shell.c.in e80fe5118fc3b942c1becc67ebfca6a887dbab9295e0bd5b6da61c4375baa637
 -F src/sqlite.h.in f0c1ecb5af508aa8e970cd8bc0ec851e6c380b81825038d458846c2fcdfcef50
++F src/shell.c.in 9862f7ffaecb4a23c43db7f7b4556b43a7fdc734e4e764abc8866c997eebd4dd
++F src/sqlite.h.in 3c1c015cc0b624737c528466f58467109aa60c9fa62696712e8dbc4566f72fab
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h e97f4e9b509408fea4c4e9bef5a41608dfac343b4d3c7a990dedde1e19af9510
- F src/sqliteInt.h 149e887c58f288e0bee1ee8da40dfec95f20ceea7ed5c9551fa1c9fa333f840a
 -F src/sqliteInt.h df3bc11691f5977041efb0d16fcd2b5e10e97bc5f8231edd3fbc0ed24978be30
++F src/sqliteInt.h 2ed3bfc7a7fbf7113f992057ceafa9f9690d01673f8ae25a7d2a8413e947c404
  F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
 -F src/status.c 4b8bc2a6905163a38b739854a35b826c737333fab5b1f8e03fa7eb9a4799c4c1
 +F src/status.c d0956e57c71160155f620a3efeb1e5c05a3f8b9a897dd09c5263268e5d237579
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
 -F src/tclsqlite.c 428e813dabf82804bc13196af35a0c3c6ef4347fe557fa6717c5c66bba6e8520
 +F src/tclsqlite.c 78450c0a24bbd9379a8f4827d830e743d5f884389042d6644e4bcba17fdde952
  F src/test1.c 63761c2be2607f1b425fde991beda48aed384f8d67f2b4ee549174c88b433009
  F src/test2.c 3efb99ab7f1fc8d154933e02ae1378bac9637da5
  F src/test3.c 61798bb0d38b915067a8c8e03f5a534b431181f802659a6616f9b4ff7d872644
@@@ -615,25 -613,25 +615,25 @@@ 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 bae853ad129d1129c063de8630a3e99e306283bc40146f359b1bb91be2c08f1e
 +F src/tokenize.c 9495a8272c339a330071d0078a85d1e2f36d1f4c39306495c2b080a2350060e1
- F src/treeview.c 43f88d0fd19976a60aee6867959213b438593276f1e8179048df85f416a1ab19
+ F src/treeview.c 9dfdb7ff7f6645d0a6458dbdf4ffac041c071c4533a6db8bb6e502b979ac67bc
 -F src/trigger.c 3f612ce5f0858b6c23460a3c799d01f408b49b0b29d931d8b8e6fc224a8667de
 +F src/trigger.c db412c9616de92de782540e84095262eec7eabc5627b3a5f3974ec30bcf58204
  F src/update.c 69c4c10bc6873a80c0a77cb578f9fc60ee90003d03f9530bc3370fa24615772d
  F src/upsert.c 8789047a8f0a601ea42fa0256d1ba3190c13746b6ba940fe2d25643a7e991937
  F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
- F src/util.c 3f27a1eae01c8bbbb8cdef2f26bd8e6a2a7db08106ef7c3dcc990787a5da6e86
+ F src/util.c 30df8356e231dad33be10bb27897655002668343280004ba28c734489414a167
 -F src/vacuum.c 454973a59fb20bb982efc2df568a098616db6328a0491b6e84e2e07f7333db45
 -F src/vdbe.c a80943ed189ed5f4215636bde0aa7901319b051baffc0706f93a786bdf49ffcf
 -F src/vdbe.h 25dabb25c7e157b84e59260cfb5b466c3ac103ede9f36f4db371332c47601abe
 +F src/vacuum.c 344acf0354037adb6d64451968a4ec0a6a8f81e753acdc5fe852cb4d4fcf4a6a
- F src/vdbe.c 571042c58e365eaf3de94d3db2599e25323a463d2632ecef4f33ae7c4de82e4d
++F src/vdbe.c 7c39b91e36a40a23ae11c3f4e62ca10d40a45a88fec81189dbf083990ba49585
 +F src/vdbe.h bfde0b0f429a0ba4203e5319780a6a1c8b2a809c5cd6baa9ae22e257a657b8b3
  F src/vdbeInt.h 38206c8dd6b60ff03d9fd4f626b1b4fd0eef7cdc44f2fc2c1973b0f932a3f26b
- F src/vdbeapi.c aa5aaf2c37676b83af5724c6cd8207a3064ed46a217fd180957f75ac84f7a2a5
- F src/vdbeaux.c a133350fa97ca98ad4c1fb1e0cc11c677c09a74df0717384ce3ce2f9a1483baa
- F src/vdbeblob.c ae6c3cbc723d0a21d6a5c61c573b45080f795e15a524bc29953bc3114348fa7a
- F src/vdbemem.c 0e830c2aab24241eed85bd4c8a5bd8c9b959081316477440bfffb35089ba7d0b
+ F src/vdbeapi.c 7b83468feb1d42a09d4c2e5241a3eaa3d1f138e289a843cba9fd3f1dad95ca67
 -F src/vdbeaux.c a57c760d1897f1b72f6fae26983df363db7a2c42d88721187e907f2c84862b42
 -F src/vdbeblob.c 292e96c01c4219fca71d74e1002906d43eb232af4bd83f7552a3faec741f3eb8
++F src/vdbeaux.c 5b860382346acfc4b1748fa0ec9fd59999f5ed51de7a7e498eeee3bd4bf4cf73
++F src/vdbeblob.c 386d80da191031a1b809004a9983c17ede7e46028d2bc1d7934fbda4762d3567
+ F src/vdbemem.c 8be0af1060012520381d3296fcb1718e80cd5b99ce04f51f7e1c4dba4072caac
  F src/vdbesort.c cd5130f683706c1a43e165a74187745fb3351cb56052cf9dc91de820634bbde2
  F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1945f1d2e6be5927ec12c06d89b03ef2a4def34bf823
  F src/vdbevtab.c f99b275366c5fc5e2d99f734729880994ab9500bdafde7fae3b02d562b9d323c
- F src/vtab.c 86fc8020a6cb7cd01396c01924a07dc5eb07e35f2d3574d3ab239ffb135284cc
 -F src/vtab.c d07cc24dd84b0b51bf05adb187b0d2e6b0cac56cfbc0197995a26d4f8fa5c7e2
++F src/vtab.c 3cf904c78bd2a034b731bb4d3408a6d625e1c076123f4df1f95e1c0b9638c957
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
  F src/wal.c 2be08331d798237ad5d7ae0b252700ffb2b63189cb18d993496d009a93e2f81c
  F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
@@@ -1872,7 -1862,7 +1872,7 @@@ F tool/mkmsvcmin.tcl 6ecab9fe22c2c8de4d
  F tool/mkopcodec.tcl 33d20791e191df43209b77d37f0ff0904620b28465cca6990cf8d60da61a07ef
  F tool/mkopcodeh.tcl 130b88697da6ec5b89b41844d955d08fb62c2552e889dec8c7bcecb28d8f50bd
  F tool/mkopts.tcl 680f785fdb09729fd9ac50632413da4eadbdf9071535e3f26d03795828ab07fa
- F tool/mkpragmatab.tcl 650e689c71d57580972b894ec98c5803d34c49d2db850473f4287229b3091b71
 -F tool/mkpragmatab.tcl de206c64b6e9ac8cd5e3cbd0ffe456f07d5710605ef8385d677e60ce3335ea12
++F tool/mkpragmatab.tcl 670bc23facb66ed982cc6cd7f678505bd6544ebb501bdf4f5fd22ebecbaca73f
  F tool/mkshellc.tcl df5d249617f9cc94d5c48eb0401673eb3f31f383ecbc54e8a13ca3dd97e89450
  F tool/mksourceid.c 36aa8020014aed0836fd13c51d6dc9219b0df1761d6b5f58ff5b616211b079b9
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
@@@ -1939,7 -1929,7 +1939,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 c8d1f17fde280acd3e98772d947a5b1e698b08d25b23bcd0731ae2d18cfbddcf 8b24c177061c38361588f419eda9b7943b72a0c6b2855b6f39272451b8a1b813
- R a5e83cfff0ecd99be280c76ff7d7a24c
 -P f52b84e69e5fcbe59ccc6163e7e78aa3822f2c354c88f8a76a2d1d4c90a99821
 -R 670ebc316cf1a452957a2d11a7221cf2
++P 64234c5c9a5709e7c7c1b18bf32f4374692129b353c4698010abfc98bd00bcc4 e162da3ab4c183b67872be004035c48fc8f20084bc5757aec27410ce23a36631
++R c8065e298247ab3b8af6ce63f1a29e24
  U drh
- Z c3acbdaa9ebf3d49766fe9216fcd8c82
 -Z 70867d1471ed7c4b89f3d005caea5399
++Z 3d2dc7b00c0f161b024ab5e171ec5d74
diff --cc manifest.uuid
index 4323d4e342,2057820b87..176acfe5ca
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 64234c5c9a5709e7c7c1b18bf32f4374692129b353c4698010abfc98bd00bcc4
 -e162da3ab4c183b67872be004035c48fc8f20084bc5757aec27410ce23a36631
++cd15fc3c08373dad63ba7eafb117d0d09913b8fc339882fd909da5ec485a7138
diff --cc src/shell.c.in
index 98b7976016,27dbe98957..ca27032b10
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@@ -9145,12 -8902,8 +9145,10 @@@ 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;
-       }else if( optionMatch(z, "excl") ){
-         p->openFlags |= SQLITE_OPEN_EXCLUSIVE;
  #ifndef SQLITE_OMIT_DESERIALIZE
        }else if( optionMatch(z, "deserialize") ){
          p->openMode = SHELL_OPEN_DESERIALIZE;
diff --cc src/vtab.c
index a580e6ce1b,9b95297f2b..4f19b7a65b
--- a/src/vtab.c
+++ b/src/vtab.c
@@@ -583,8 -573,10 +591,11 @@@ static int vtabCallConstructor
    char *zModuleName;
    int iDb;
    VtabCtx *pCtx;
 +  int nByte;                      /* Bytes of space to allocate */
  
+   assert( IsVirtual(pTab) );
+   azArg = (const char *const*)pTab->u.vtab.azArg;
+ 
    /* Check that the virtual-table is not already being initialized */
    for(pCtx=db->pVtabCtx; pCtx; pCtx=pCtx->pPrior){
      if( pCtx->pTab==pTab ){