From: drh <>
Date: Fri, 6 May 2022 17:06:28 +0000 (+0000)
Subject: Merge the 3.38.5 fix into the 3.38 subbranch of reuse-schema.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2Freuse-schema-3.38;p=thirdparty%2Fsqlite.git

Merge the 3.38.5 fix into the 3.38 subbranch of reuse-schema.

FossilOrigin-Name: bfccca2ba37dd99c28e10364ad85a3b8d5bd9547c6159cb7a1a2aa903a508e77
---

c9518d82dc81544c7723390cc8ba2f55046188b0
diff --cc manifest
index 2be15fd04f,0b6d0669f9..1e780c2aab
--- a/manifest
+++ b/manifest
@@@ -1,13 -1,13 +1,13 @@@
- C Merge\sversion-3.38.4\sinto\sthe\sreuse-schema-3.38\ssubbranch.
- D 2022-05-04T16:46:10.610
 -C Version\s3.38.5
 -D 2022-05-06T15:25:27.476
++C Merge\sthe\s3.38.5\sfix\sinto\sthe\s3.38\ssubbranch\sof\sreuse-schema.
++D 2022-05-06T17:06:28.682
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
 -F Makefile.in b210ad2733317f1a4353085dfb9d385ceec30b0e6a61d20a5accabecac6b1949
 +F Makefile.in bd57b03256fce1d968c432166e063232fa2659963ecd45f1cc2ff77b8aec850d
  F Makefile.linux-gcc f609543700659711fbd230eced1f01353117621dccae7b9fb70daa64236c5241
 -F Makefile.msc b28a8a7a977e7312f6859f560348e1eb110c21bd6cf9fab0d16537c0a514eef3
 +F Makefile.msc fccc0062959ce30dde9fa79c88e77939637fd43706b9f3dd4f68065b5594e9b5
  F README.md 2dd87a5c1d108b224921f3dd47dea567973f706e1f6959386282a626f459a70c
- F VERSION 01b4df68a6266aba3e9ddaee2431393b03fd9c7f9a1f972640618f91bb743a4c
+ F VERSION 2cef599294698e267cbcdadf44f14a0637a0015c1872cb37a16fe723d7c7add0
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
  F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
@@@ -546,23 -545,23 +546,23 @@@ F src/parse.y 0f02b27cdaa334441463153ff
  F src/pcache.c 0aab73936341fad83d107cf62c6a7bc2d2d5fb9aaec8c3ce61e19fc18e4560fc
  F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586
  F src/pcache1.c 54881292a9a5db202b2c0ac541c5e3ef9a5e8c4f1c1383adb2601d5499a60e65
 -F src/pragma.c 7c024d690a3dc93f61830f11f900e4af2357f31d081b0c79099ca5e28919cba7
 -F src/pragma.h 87330ed2fbfa2a1274de93ca0ab850fba336189228cb256089202c3b52766fad
 -F src/prepare.c c62820c15dcb63013519c8e41d9f928d7478672cc902cfd0581c733c271dbf45
 +F src/pragma.c 770a2ce23196a4d6b88026848ec2a347264fb2e23efc0a0a0ce58e55c99680a1
 +F src/pragma.h 50f6d3b408ed56bde4f4e4aead8c0b2022030b692e8de237c1b7a0b5ce87a0c8
- F src/prepare.c c34dc2076e4d4e2b8c311dbbd7d2f16f81815636f50ed33b5c0897dbe837431a
++F src/prepare.c d91f59db086b7b738ada7f06c1c09e151a40ca219565d1937da3968b299166e6
  F src/printf.c 05d8dfd2018bc4fc3ddb8b37eb97ccef7abf985643fa1caebdcf2916ca90fa32
  F src/random.c 097dc8b31b8fba5a9aca1697aeb9fd82078ec91be734c16bffda620ced7ab83c
  F src/resolve.c ea935b87d6fb36c78b70cdc7b28561dc8f33f2ef37048389549c7b5ef9b0ba5e
  F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
  F src/select.c ba0cd3d264fa788c8d65f063d5ec3e1d65b0dac206c822a564a59ba550210cfc
- F src/shell.c.in 0f9f34114d7d3318961f6c195a7d7cf16249573cbf3b8f9d67552362e9cb206e
 -F src/shell.c.in e2bc31eca23a1d1d2aaea02dcfde6dfe0ee96bdfa6cbcc36c79f02e457bef18c
 -F src/sqlite.h.in b93deee892f1bc4030e5c8712df9e21d786a1bf8e921ab8dc987eaf1e44c676f
++F src/shell.c.in 71d30be41a0e43f9cdaabb7cc3334e18ccf60afafb84077101f69dd9f640ffe0
 +F src/sqlite.h.in c8f93ce5a0153484bd176d67d6d23deec48076fb7d45d1752411a6e1ed92fc6f
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h a95cb9ed106e3d39e2118e4dcc15a14faec3fa50d0093425083d340d9dfd96e6
 -F src/sqliteInt.h 272c5ca0a16a1963c0c956524c615a27af57be950b97a395d39cb9fd9b31fc4e
 +F src/sqliteInt.h f249dead228fcfa65e3a5848180bb3010bbd780433373ef17e2cc37bf6a21311
  F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
 -F src/status.c 4b8bc2a6905163a38b739854a35b826c737333fab5b1f8e03fa7eb9a4799c4c1
 +F src/status.c d0956e57c71160155f620a3efeb1e5c05a3f8b9a897dd09c5263268e5d237579
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
 -F src/tclsqlite.c 1f6673991147bc2cecc08a40d22f9803b84c805b24b499fe727f392256f73474
 +F src/tclsqlite.c d438eb0f0d345f5cfccc6d00232677082bb9cf1dfd2422f7d7891fae58516260
  F src/test1.c 87fda59eea3ac1eba1baef37c1967565cb1b8d6d264649f2e57f252ca5989914
  F src/test2.c 3efb99ab7f1fc8d154933e02ae1378bac9637da5
  F src/test3.c 61798bb0d38b915067a8c8e03f5a534b431181f802659a6616f9b4ff7d872644
@@@ -1954,8 -1944,10 +1954,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 436d0a5837a750bfb66493de6efd0a9a5d8e8b66cedab433414a1f48921f2857 d402f49871152670a62f4f28cacb15d814f2c1644e9347ad7d258e562978e45e
- R 62893602e22d0107b7b8838c04f943aa
 -P 7fcdb760a4df8c5c11e94cecdc61bb8f40c86b70aa05f48e17520443a3d3b451
 -R c70a3244d878106624c489b9bff97d77
 -T +sym-release *
 -T +sym-version-3.38.5 *
++P d5b0fd8434f893db444eb62e254871d92a593c3c4871641b0392453444444e15 78d9c993d404cdfaa7fdd2973fa1052e3da9f66215cff9c5540ebe55c407d9fe
++R 61f9a16612c1f0767ba4d18e70055209
  U drh
- Z 21d065abf46c643a8c85de88ab9b42fa
 -Z 54d3523b3ce9c5f872539bc3270e6853
++Z f42e6393488a7a3af7a82ff8d2119365
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 71bcf9a5cd,5208a07ef0..017de9d1b7
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- d5b0fd8434f893db444eb62e254871d92a593c3c4871641b0392453444444e15
 -78d9c993d404cdfaa7fdd2973fa1052e3da9f66215cff9c5540ebe55c407d9fe
++bfccca2ba37dd99c28e10364ad85a3b8d5bd9547c6159cb7a1a2aa903a508e77
diff --cc src/prepare.c
index 5989b3ebbd,f55ff72fcb..307c80c7ef
--- a/src/prepare.c
+++ b/src/prepare.c
@@@ -949,13 -845,9 +957,13 @@@ static int sqlite3LockAndPrepare
      rc = sqlite3Prepare(db, zSql, nBytes, prepFlags, pOld, ppStmt, pzTail);
      assert( rc==SQLITE_OK || *ppStmt==0 );
      if( rc==SQLITE_OK || db->mallocFailed ) break;
-   }while( rc==SQLITE_ERROR_RETRY
+   }while( (rc==SQLITE_ERROR_RETRY && (cnt++)<SQLITE_MAX_PREPARE_RETRY)
         || (rc==SQLITE_SCHEMA && (sqlite3ResetOneSchema(db,-1), cnt++)==0) );
 +
    sqlite3BtreeLeaveAll(db);
 +
 +  sqlite3UnlockReusableSchema(db, bReleaseSchema);
 +
    rc = sqlite3ApiExit(db, rc);
    assert( (rc&db->errMask)==rc );
    db->busyHandler.nBusy = 0;