From: drh <>
Date: Wed, 29 Mar 2023 14:42:11 +0000 (+0000)
Subject: New #ifdefs to omit code that is unused except under STAT4.
X-Git-Tag: version-3.42.0~204
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a9fd5f224c72013062a8b34781396d3832c8f05a;p=thirdparty%2Fsqlite.git

New #ifdefs to omit code that is unused except under STAT4.

FossilOrigin-Name: 09a9b30ba7828a487a33a3ebf8028dfaa147dff67d2724584123b90a88d9814b
---

diff --git a/manifest b/manifest
index 6c086cad58..5ea5da352e 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Enhance\sPRAGMA\sintegrity_check\sso\sthat\sit\scan\sdetect\sthat\sa\sNOT\sNULL\scolumn\ncontains\sa\sNaN\svalue\sand\sreport\sthat\sas\san\serror.\ndbsqlfuzz\sf144b642fe6f1a1c196f258ac6e60118a0cb59b2.
-D 2023-03-29T11:36:24.481
+C New\s#ifdefs\sto\somit\scode\sthat\sis\sunused\sexcept\sunder\sSTAT4.
+D 2023-03-29T14:42:11.580
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -558,7 +558,7 @@ F sqlite3.1 fc7ad8990fc8409983309bb80de8c811a7506786
 F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
 F sqlite_cfg.h.in baf2e409c63d4e7a765e17769b6ff17c5a82bbd9cbf1e284fd2e4cefaff3fcf2
 F src/alter.c 3ca2f449c890f8b86ec9e06f0c4fccf0648941c3308a16904cb2852227db83f7
-F src/analyze.c 8230fc1f3ddcf5492d258f28afcd36026c0de2f35cbbee22a41eed4baaf26148
+F src/analyze.c 01bfd40026632eaae1d93212b684f539c6674cb573535dc90199674cbf7e0cdc
 F src/attach.c cc9d00d30da916ff656038211410ccf04ed784b7564639b9b61d1839ed69fd39
 F src/auth.c f4fa91b6a90bbc8e0d0f738aa284551739c9543a367071f55574681e0f24f8cf
 F src/backup.c a2891172438e385fdbe97c11c9745676bec54f518d4447090af97189fd8e52d7
@@ -575,7 +575,7 @@ F src/date.c f21815ca7172ce073db3163ac54c8d9f2841077165c1a6123b4d1c376a0c7ec7
 F src/dbpage.c d47549716549311f79dc39fe5c8fb19390a6eb2c960f8e37c89a9c4de0c1052e
 F src/dbstat.c ec92074baa61d883de58c945162d9e666c13cd7cf3a23bc38b4d1c4d0b2c2bef
 F src/delete.c a9c6d3f51c0a31e9b831e0a0580a98d702904b42d216fee530940e40dec34873
-F src/expr.c 98ba98271bbe55661d8630cc60083344b2c1713553e46b69afd7ff9f85a30e29
+F src/expr.c bf74dd13f36dfc57c2a397f3d41cf9ea35ffd17f9baed1db51bd8736b276d4b1
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c 722f20779f5342a787922deded3628d8c74b5249cab04098cf17ee2f2aaff002
 F src/func.c d187be57a886ddf4e6b7ef584a494361899be3df5eee6d4a747b68ff4aff4122
@@ -2051,8 +2051,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 c34fd9fe1b76e0a5943f014f46141cbe55d41bb1e6980adf9bcb6785a03e7883
-R df22a94c4699a51ccc0a1666db70f0f4
+P 7638d9755dc90fd353b874d03ed418fa8aaee4440290ff69b1b552eae84e5baa
+R b188963cb85e43486729f0b1a856004f
 U drh
-Z 05ab517810b9c5736ce209544eca4198
+Z 5386f27a21d49b16511eaa8ce902e6c0
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 3bb06482ac..1c60389dcf 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7638d9755dc90fd353b874d03ed418fa8aaee4440290ff69b1b552eae84e5baa
\ No newline at end of file
+09a9b30ba7828a487a33a3ebf8028dfaa147dff67d2724584123b90a88d9814b
\ No newline at end of file
diff --git a/src/analyze.c b/src/analyze.c
index b6b59a6b79..6e9d72464c 100644
--- a/src/analyze.c
+++ b/src/analyze.c
@@ -1389,7 +1389,11 @@ static void analyzeDatabase(Parse *pParse, int iDb){
   for(k=sqliteHashFirst(&pSchema->tblHash); k; k=sqliteHashNext(k)){
     Table *pTab = (Table*)sqliteHashData(k);
     analyzeOneTable(pParse, pTab, 0, iStatCur, iMem, iTab);
+#ifdef SQLITE_ENABLE_STAT4
     iMem = sqlite3FirstAvailableRegister(pParse, iMem);
+#else
+    assert( iMem==sqlite3FirstAvailableRegister(pParse,iMem) );
+#endif
   }
   loadAnalysis(pParse, iDb);
 }
diff --git a/src/expr.c b/src/expr.c
index 80bfbadc33..c17eb0f7ef 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -6646,6 +6646,7 @@ void sqlite3TouchRegister(Parse *pParse, int iReg){
   if( pParse->nMem<iReg ) pParse->nMem = iReg;
 }
 
+#if defined(SQLITE_ENABLE_STAT4) || defined(SQLITE_DEBUG)
 /*
 ** Return the latest reusable register in the set of all registers.
 ** The value returned is no less than iMin.  If any register iMin or
@@ -6666,6 +6667,7 @@ int sqlite3FirstAvailableRegister(Parse *pParse, int iMin){
   pParse->nRangeReg = 0;
   return iMin;
 }
+#endif /* SQLITE_ENABLE_STAT4 || SQLITE_DEBUG */
 
 /*
 ** Validate that no temporary register falls within the range of