From: drh <>
Date: Mon, 25 Mar 2024 14:44:10 +0000 (+0000)
Subject: Fix an inaccuracy in automatic indexes that was exposed by the fix
X-Git-Tag: version-3.46.0~98
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ed6c9aa6abf27b198313a1e274a7a9a22b6a8542;p=thirdparty%2Fsqlite.git

Fix an inaccuracy in automatic indexes that was exposed by the fix
at [80c4223098c1827f].

FossilOrigin-Name: fdc9406f1c8ba4a7341c1e408f6042ddc788cf65f98e1de2ee101390bfb0abae
---

diff --git a/manifest b/manifest
index 4797b53cd8..a5e165b27b 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\spragma4.test\sscript\sso\sthat\sit\sworks\swith\sSQLITE_OMIT_VIRTUALTABLE.
-D 2024-03-25T13:18:46.591
+C Fix\san\sinaccuracy\sin\sautomatic\sindexes\sthat\swas\sexposed\sby\sthe\sfix\nat\s[80c4223098c1827f].
+D 2024-03-25T14:44:10.198
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -835,7 +835,7 @@ F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 F src/wal.c 887fc4ca3f020ebb2e376f222069570834ac63bf50111ef0cbf3ae417048ed89
 F src/wal.h ba252daaa94f889f4b2c17c027e823d9be47ce39da1d3799886bbd51f0490452
 F src/walker.c 7c7ea0115345851c3da4e04e2e239a29983b61fb5b038b94eede6aba462640e2
-F src/where.c 2e01199202dd117a27f7597e1f554a5cd55e7465e2f39ff9a78adc9cba98b971
+F src/where.c 11a67988c3a5be2e7ee07c958998f3ad4b30dc491c0add894c2933c752415b16
 F src/whereInt.h 82a13766f13d1a53b05387c2e60726289ef26404bc7b9b1f7770204d97357fb8
 F src/wherecode.c 5d77db30a2a3dd532492ae882de114edba2fae672622056b1c7fd61f5917a8f1
 F src/whereexpr.c 7b64295f1d82ad0928df435925dd7bbd5997b44a026153113eace0d9e71ff435
@@ -2182,8 +2182,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 38578b5af2e97c420f3106bc486318604aecbaa327365bbc2e9518be84491495
-R 4aabcb0c5c9b41b63fc5196fb947c9b6
+P f8fe6fb69c4164d087783a0d6990112afabea78daa4d8985eb6df7df6f45ac27
+R a7eca515ed0d2c704ec351621eaadae9
 U drh
-Z d83b8554c188328afa7b3f0d71ba5b85
+Z 126d8b46e6dcce24a23c7b6d521c4841
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index e76f63aa38..e02a458158 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f8fe6fb69c4164d087783a0d6990112afabea78daa4d8985eb6df7df6f45ac27
\ No newline at end of file
+fdc9406f1c8ba4a7341c1e408f6042ddc788cf65f98e1de2ee101390bfb0abae
\ No newline at end of file
diff --git a/src/where.c b/src/where.c
index 3fbb768af5..5767b44128 100644
--- a/src/where.c
+++ b/src/where.c
@@ -984,7 +984,7 @@ static SQLITE_NOINLINE void constructAutomaticIndex(
   ** if they go out of sync.
   */
   if( IsView(pTable) ){
-    extraCols = ALLBITS;
+    extraCols = ALLBITS & ~idxCols;
   }else{
     extraCols = pSrc->colUsed & (~idxCols | MASKBIT(BMS-1));
   }