From: drh <>
Date: Tue, 20 Feb 2024 13:10:46 +0000 (+0000)
Subject: Remove an unused variable from the merge in the previous check-in.
X-Git-Tag: version-3.46.0~203
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4b2eeb289bef1735ab56aa4867f2c3b69550b9c2;p=thirdparty%2Fsqlite.git

Remove an unused variable from the merge in the previous check-in.

FossilOrigin-Name: 5c26bf379e18e28d800525bd03e2d5597e2f37674979302f351b99abfc064749
---

diff --git a/manifest b/manifest
index c071235824..abca404cf5 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Enhancements\sto\sPRAGMA\soptimize\sand\sANALYZE.\s\sAdd\sthe\s0x10000\sflag\sto\nPRAGMA\soptimize.\s\sANALYZE\snow\srecords\szero-size\spartial\sindexes\sin\sthe\nsqlite_stat1\stable.\s\sPRAGMA\soptimize\slooks\sfor\sboth\sgrowth\sand\sshrinkage\nin\stable\ssizes,\sand\suses\stighter\sbounds\s(10x\srather\sthan\s25x)\sto\strigger\na\sre-analyze.\s\sPRAGMA\soptimize\sautomatically\suses\sare\sreasonable\nanalysis_limit\sto\sprevent\sexcessive\sruntimes.
-D 2024-02-20T12:48:00.737
+C Remove\san\sunused\svariable\sfrom\sthe\smerge\sin\sthe\sprevious\scheck-in.
+D 2024-02-20T13:10:46.615
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -732,7 +732,7 @@ F src/parse.y bfd6da46fc895cd8237400ff485d04ab0b32e47eb56de20982bb7f53e56c1f42
 F src/pcache.c 040b165f30622a21b7a9a77c6f2e4877a32fb7f22d4c7f0d2a6fa6833a156a75
 F src/pcache.h 1497ce1b823cf00094bb0cf3bac37b345937e6f910890c626b16512316d3abf5
 F src/pcache1.c 602acb23c471bb8d557a6f0083cc2be641d6cafcafa19e481eba7ef4c9ca0f00
-F src/pragma.c cc9ccfde12caf4db782332dc7edd6c0aaf0bfa9bb8c0bff86a3f138521f11b27
+F src/pragma.c f35ba8fb0b3782ef671cc38b3cdaa457e82befe022558f343240344e57d5f5f4
 F src/pragma.h e690a356c18e98414d2e870ea791c1be1545a714ba623719deb63f7f226d8bb7
 F src/prepare.c 371f6115cb69286ebc12c6f2d7511279c2e47d9f54f475d46a554d687a3b312c
 F src/printf.c d3392b2a20ee314ddeef34fb43c904bf4619eb20ff9a9e07e3950a7e4dcd6912
@@ -2162,9 +2162,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 f18b2524da6bbbcf372b292df52fbe6efa49fd6e1f1f13ef2447279d559f7a08 6c5a0c85454e3c658e51fab611c169c034447174022eebc52fd8619b528a4765
-R 1d7e6aefb784a3b060fc17ebc00f9588
-T +closed 6c5a0c85454e3c658e51fab611c169c034447174022eebc52fd8619b528a4765
+P 63ef234e88857a653fa3541e80d59802ceccb806ac8296e8bae79a385b7086f7
+R a21cfe7fc11d4cc3af701137f92d89ba
 U drh
-Z b62a3cf41afb08b6428ca7c918282668
+Z d6568f521192ee23916aac9c92a235a6
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 54028cc0d8..262b24e277 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-63ef234e88857a653fa3541e80d59802ceccb806ac8296e8bae79a385b7086f7
\ No newline at end of file
+5c26bf379e18e28d800525bd03e2d5597e2f37674979302f351b99abfc064749
\ No newline at end of file
diff --git a/src/pragma.c b/src/pragma.c
index 877fb3f721..af51d18657 100644
--- a/src/pragma.c
+++ b/src/pragma.c
@@ -2486,7 +2486,6 @@ void sqlite3Pragma(
     int nCheck = 0;        /* Number of tables to be optimized */
     int nBtree = 0;        /* Number of btrees to scan */
     int nIndex;            /* Number of indexes on the current table */
-    int hasStat1;          /* True if any STAT1 info available for the table */
 
     if( zRight ){
       opMask = (u32)sqlite3Atoi(zRight);
@@ -2521,13 +2520,10 @@ void sqlite3Pragma(
         ** indicate a new, unanalyzed index
         */
         szThreshold = pTab->nRowLogEst;
-        hasStat1 = (pTab->tabFlags & TF_HasStat1)!=0;
         nIndex = 0;
         for(pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext){
           nIndex++;
-          if( pIdx->hasStat1 ){
-            hasStat1 = 1;
-          }else{
+          if( !pIdx->hasStat1 ){
             szThreshold = -1; /* Always analyze if any index lacks statistics */
           }
         }