From: dan <Dan Kennedy>
Date: Tue, 7 Feb 2023 21:03:50 +0000 (+0000)
Subject: Update an if(...) expression in sqlite3InitCallback() to match the same expression... 
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=db8189008ca046e6fe73840b022e6bc4dac75875;p=thirdparty%2Fsqlite.git

Update an if(...) expression in sqlite3InitCallback() to match the same expression on trunk.

FossilOrigin-Name: c73babca3839e5b6baa5c8596634ce7576527ab92e5312134f651b57f7febba9
---

diff --git a/manifest b/manifest
index 1af23dc11a..f399cd55d0 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Avoid\sloading\s(and\sthen\sdiscarding)\sschemas\sfor\sall\sattached\sdatabases\swithin\san\sATTACH\scommand.\sThis\sis\sinefficient\sfor\sconnections\susing\sshared-schema.
-D 2023-02-07T15:57:02.261
+C Update\san\sif(...)\sexpression\sin\ssqlite3InitCallback()\sto\smatch\sthe\ssame\sexpression\son\strunk.
+D 2023-02-07T21:03:50.902
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -617,7 +617,7 @@ F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586
 F src/pcache1.c dee95e3cd2b61e6512dc814c5ab76d5eb36f0bfc9441dbb4260fccc0d12bbddc
 F src/pragma.c 4cf2b8d691f1235f6de4fc0f108a31280d6e3835e568617124ebe85ff0635fec
 F src/pragma.h 50f6d3b408ed56bde4f4e4aead8c0b2022030b692e8de237c1b7a0b5ce87a0c8
-F src/prepare.c c1b75db209f44b38e41fac02645fc34c8831a7e49d8338456ba82e7a7cc0a35c
+F src/prepare.c 42a8566557fb7a6283bfe305d13aa6993dd3d956bcf00ad0d6924045c5abec03
 F src/printf.c ff4b05e38bf928ff1b80d3dda4f977b10fe39ecbfe69c018224c7e5594fb2455
 F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c d62c5665279cc7485f9d45b5e20911cc7b19c203f268321a90d05d74f4725750
@@ -2055,8 +2055,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 4d21640c58249a8bdbf4ed48ae22b745f3b87af7d046cc58cae6ff913b79d742
-R 08cbc8f769d43fef887b292cae875e1d
+P 50174e82ea35ce61332bc7863ce494078cb799984bcee905e620d1b48be1b595
+R 92fcd85900661206b0642a14ccdaaf79
 U dan
-Z acc985bd80718346b287466c9bd3a13e
+Z bedb137db8ba062a4ca038b7284419c2
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 5ba89e7add..ceb5743f8d 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-50174e82ea35ce61332bc7863ce494078cb799984bcee905e620d1b48be1b595
\ No newline at end of file
+c73babca3839e5b6baa5c8596634ce7576527ab92e5312134f651b57f7febba9
\ No newline at end of file
diff --git a/src/prepare.c b/src/prepare.c
index 5b47423799..d0078da735 100644
--- a/src/prepare.c
+++ b/src/prepare.c
@@ -193,9 +193,8 @@ int sqlite3InitCallback(void *pInit, int argc, char **argv, char **NotUsed){
         if( rc > pData->rc ) pData->rc = rc;
         if( rc==SQLITE_NOMEM ){
           sqlite3OomFault(db);
-        }else if( rc!=SQLITE_INTERRUPT 
+        }else if( rc!=SQLITE_INTERRUPT && (rc&0xFF)!=SQLITE_LOCKED
 #ifdef SQLITE_ENABLE_SHARED_SCHEMA
-               && (rc&0xFF)!=SQLITE_LOCKED 
                && (rc&0xFF)!=SQLITE_IOERR
 #endif
         ){