From: drh <>
Date: Sat, 28 May 2022 15:01:35 +0000 (+0000)
Subject: Merge the latest trunk enhancements into the reuse-schema branch.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=39ade05f339ce164a412f5631bd55b73c0a55b4d;p=thirdparty%2Fsqlite.git

Merge the latest trunk enhancements into the reuse-schema branch.

FossilOrigin-Name: 4d46296ef6c2e7d63d2d2dc59af1e7d62c951b3c40784688811a6b4f230fc869
---

39ade05f339ce164a412f5631bd55b73c0a55b4d
diff --cc manifest
index c18c66abcf,e804cf0c3a..310642be21
--- a/manifest
+++ b/manifest
@@@ -1,11 -1,11 +1,11 @@@
 -C Apply\sthe\sUPDATE-FROM\sfile\sfrom\scheck-in\s[98b3816bbaf539ea]\sto\nupdate-delete-limit\sbuilds.
 -D 2022-05-28T14:03:23.844
 +C Merge\sthe\slatest\strunk\senhancements\sinto\sthe\sreuse-schema\sbranch.
- D 2022-05-17T15:33:05.752
++D 2022-05-28T15:01:35.786
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
- F Makefile.in bd57b03256fce1d968c432166e063232fa2659963ecd45f1cc2ff77b8aec850d
 -F Makefile.in 038e29ac929fe8549e73cd92d1c360cdb0faa76ab80ca8fed29677b0ed814e2c
++F Makefile.in 17fc2645212fe9d8dbb3ceabb10d0916f42d05f571fe40799ea2c8ea1f2d85ff
  F Makefile.linux-gcc f609543700659711fbd230eced1f01353117621dccae7b9fb70daa64236c5241
 -F Makefile.msc b28a8a7a977e7312f6859f560348e1eb110c21bd6cf9fab0d16537c0a514eef3
 +F Makefile.msc fccc0062959ce30dde9fa79c88e77939637fd43706b9f3dd4f68065b5594e9b5
  F README.md 8b8df9ca852aeac4864eb1e400002633ee6db84065bd01b78c33817f97d31f5e
  F VERSION fa8e7d2d1cc962f9e14c6d410387cf75860ee139462763fda887c1be4261f824
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -487,9 -500,9 +501,9 @@@ F spec.template 86a4a43b99ebb3e75e6b9a7
  F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
  F sqlite3.1 fc7ad8990fc8409983309bb80de8c811a7506786
  F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
- F src/alter.c 0951fd0862dfbb9c266f27e9c551cb48e33693459a4b5d0a7a03bd335edee98f
 -F src/alter.c 0390ca1d69ec3626cfa9f153114b7ab233e6b2bada6a9eb91361ed385fe90deb
 -F src/analyze.c aabdf3769c7fd9954a8ec508eb7041ae174b66f88d12c47199fabbea9a646467
 -F src/attach.c 4431f82f0247bf3aaf91589acafdff77d1882235c95407b36da1585c765fbbc8
++F src/alter.c 23f95fd33885c27edb5ece2bec9c184d3c7e575a3de60a97c036aa9d225e06f4
 +F src/analyze.c ac1decb7db9f8fc12ad930d35b44f06d4097643b52dc9264ae18f8eca5c25f0d
 +F src/attach.c e1eb237a21422b2d637fd854e1b72609b1b589e24b4b3a5cac0e13c9ef20ee8d
  F src/auth.c f4fa91b6a90bbc8e0d0f738aa284551739c9543a367071f55574681e0f24f8cf
  F src/backup.c a2891172438e385fdbe97c11c9745676bec54f518d4447090af97189fd8e52d7
  F src/bitvec.c 7c849aac407230278445cb069bebc5f89bf2ddd87c5ed9459b070a9175707b3d
@@@ -554,16 -567,16 +568,16 @@@ F src/printf.c 6166a30417b05c5b2f82e1f1
  F src/random.c 097dc8b31b8fba5a9aca1697aeb9fd82078ec91be734c16bffda620ced7ab83c
  F src/resolve.c a4eb3c617027fd049b07432f3b942ea7151fa793a332a11a7d0f58c9539e104f
  F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
- F src/select.c 74060a09f66c0c056f3c61627e22cb484af0bbfa29d7d14dcf17c684742c15de
- F src/shell.c.in 63592c13d286262590b4fd9482d93836462f28d75512208b44ab2e8ee76e559d
- F src/sqlite.h.in fc52a5376140d7560128db36bdd0626bc3e9fb6782e240c0901f12532cff1961
+ F src/select.c 7a4c5023d6c3bcd243546dbe9bbf5b280a60ca565658d037b8c0ec8dd77e1136
 -F src/shell.c.in b76e681f9e441928d574f21f9473ef615158bbeab1ae49f05ecab9d81730a51d
 -F src/sqlite.h.in 172528c287399a34f188154017b7268bf82c6d5b780902e361958d2318c4e37c
++F src/shell.c.in bd63d902c44d44c8286e89287ab80c55d2ec88215bc523045c4628a3e61f5174
++F src/sqlite.h.in 625ce4544e658f8a9e64d5f07fe632c7a86ef62ef2dafeb4671cda56ee273feb
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h a988810c9b21c0dc36dc7a62735012339dc76fc7ab448fb0792721d30eacb69d
- F src/sqliteInt.h 66cfd348a3d9e5592285a5b933758fe135d8a21ce92ac0b2d704f69999a3507d
 -F src/sqliteInt.h 3064533677f135771e71843b5221482df18d6589afe65e6a7ef828ccb8879a5f
++F src/sqliteInt.h 10e20c29c74b0d8178e6d4700f57dae3967b118074e54e4fa59792ab9b997c4d
  F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
 -F src/status.c 4a3da6d77eeb3531cb0dbdf7047772a2a1b99f98c69e90ce009c75fe6328b2c0
 +F src/status.c 99fd56b274f5d4b79b5af65a92ae37286755cd212ed2c6b13ad34183970b2165
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
 -F src/tclsqlite.c 1f6673991147bc2cecc08a40d22f9803b84c805b24b499fe727f392256f73474
 +F src/tclsqlite.c d438eb0f0d345f5cfccc6d00232677082bb9cf1dfd2422f7d7891fae58516260
  F src/test1.c 1356984e97bff07e4a8cc3863e892f05b3348678a74783bb6f350b76316736f1
  F src/test2.c 3efb99ab7f1fc8d154933e02ae1378bac9637da5
  F src/test3.c 61798bb0d38b915067a8c8e03f5a534b431181f802659a6616f9b4ff7d872644
@@@ -621,7 -633,7 +635,7 @@@ F src/test_wsd.c 41cadfd9d97fe8e3e4e44f
  F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
  F src/tokenize.c a38f52058b517929e264094abd0b5fd1e8e145a1aa43bc6f6a72ae5218f96c98
  F src/treeview.c 73facf395c8841653b9a54e789d8c80e15bc3d0d1cb9d16104c2d889c15e33cd
- F src/trigger.c f6934afe27eb3c6e2bd0e7073bee78d437d03921f23d3d201786d0ac41a4a018
 -F src/trigger.c 61bea163b1fa3039bc572ed8312461b978e5c527e5301f302b078f4c1ccdec6a
++F src/trigger.c 45a863a534dea1744642bfb68da2441333179252b16f0cacf8d4c52172378b18
  F src/update.c 2cfaded82ca80ff56afb8c3ae5e88284e0824bfd86119827cc22481959f96f92
  F src/upsert.c 8789047a8f0a601ea42fa0256d1ba3190c13746b6ba940fe2d25643a7e991937
  F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
@@@ -1964,8 -1970,8 +1980,8 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 9f6d6e6135f9b8120fc20adfd595d5aba2004659859ef5cb6cc67981f850ccdc f7e1ceb5b59a876cfd04a8aac0ee2b322c970555b9c361b4953d711ef6596e37
- R 544e3bb6a3c3c5dd6f777cde2d82b3b7
 -P fd668da5ccf037c2ad8e61e381dd1eb398a8deab42a00593e551c30bd176890d
 -R e62d67531970b1619ea2f47c2f8c0901
++P 495f0353db126bd4ab4cd654842f253b4938a8e8bf285a186ec69f95fb221923 7e87892c249f023ee9ed1d5f75a9ad8db10fb38f14dd9e6954b12b9b28400b07
++R 09e787931cb706c6900d5b5befd3ac84
  U drh
- Z 93c5f2009d1aca5d28083f920f304c0f
 -Z 2f27046509ba92f24780e3263d6632b0
++Z 06c4c2c1b6df6a10d73b61e7e4910cec
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 96a972357a,a331df2c16..ff451fb4cc
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 495f0353db126bd4ab4cd654842f253b4938a8e8bf285a186ec69f95fb221923
 -7e87892c249f023ee9ed1d5f75a9ad8db10fb38f14dd9e6954b12b9b28400b07
++4d46296ef6c2e7d63d2d2dc59af1e7d62c951b3c40784688811a6b4f230fc869
diff --cc src/shell.c.in
index 76a732f7a5,b03c96183d..75cc3d6ce0
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@@ -4434,13 -4484,7 +4485,13 @@@ static const char *(azHelp[]) = 
    "      --sha3-384            Use the sha3-384 algorithm",
    "      --sha3-512            Use the sha3-512 algorithm",
    "    Any other argument is a LIKE pattern for tables to hash",
 +#if !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_ENABLE_DBPAGE_VTAB)
 +  ".shared-schema CMD DB1 DB2 ...",
 +  "    Commands:",
 +  "       check                Determine if DB1, DB2, etc have identical schemas",
 +  "       fix                  Attempt to make DB1, DB2, etc compatible",
 +#endif
- #ifndef SQLITE_NOHAVE_SYSTEM
+ #if !defined(SQLITE_NOHAVE_SYSTEM) && !defined(SQLITE_SHELL_WASM_MODE)
    ".shell CMD ARGS...       Run CMD ARGS... in a system shell",
  #endif
    ".show                    Show the current values for various settings",
@@@ -10825,14 -10669,7 +10912,14 @@@ static int do_meta_command(char *zLine
      sqlite3_free(zSql);
    }else
  
 +#if !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_ENABLE_DBPAGE_VTAB)
 +  if( c=='s' && strncmp(azArg[0], "shared-schema", n)==0 ){
 +    open_db(p, 0);
 +    sharedSchemaDotCommand(p, azArg, nArg);
 +  }else
 +#endif
 +
- #ifndef SQLITE_NOHAVE_SYSTEM
+ #if !defined(SQLITE_NOHAVE_SYSTEM) && !defined(SQLITE_SHELL_WASM_MODE)
    if( c=='s'
     && (strncmp(azArg[0], "shell", n)==0 || strncmp(azArg[0],"system",n)==0)
    ){