From: drh <>
Date: Fri, 10 Apr 2026 10:27:04 +0000 (+0000)
Subject: Change a variable name to try to quash a compiler warning reported
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=931fa90d740cbdd7641fb826e241d0c3c0832bdc;p=thirdparty%2Fsqlite.git

Change a variable name to try to quash a compiler warning reported
by [forum:/forumpost/2026-04-10T09:33:27z|forum post 2026-04-10T09:33:27z].
This is just a guess, as we have no way of reproducing the warning,
and hence no way of knowing if it fixes the problem.

FossilOrigin-Name: e065c019d29d4e82a21a89984b86c1811c2b1bdd4663c792857cf89ea2cd91c3
---

diff --git a/manifest b/manifest
index 98a5df1bd6..4ab5c38f38 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Correct\sshell\sresult\scode\spropagation\sregression\sintroduced\sin\s[ff084ae341eab5c4]\sand\sreported\sin\s[forum:6fa3247e9724844c|forum\spost\s6fa3247e9724844c].
-D 2026-04-10T08:36:55.583
+C Change\sa\svariable\sname\sto\stry\sto\squash\sa\scompiler\swarning\sreported\nby\s[forum:/forumpost/2026-04-10T09:33:27z|forum\spost\s2026-04-10T09:33:27z].\nThis\sis\sjust\sa\sguess,\sas\swe\shave\sno\sway\sof\sreproducing\sthe\swarning,\nand\shence\sno\sway\sof\sknowing\sif\sit\sfixes\sthe\sproblem.
+D 2026-04-10T10:27:04.308
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -805,7 +805,7 @@ F src/vdbe.c 6c57525d7db0232d52687d30da1093db0c152f14206c2ef1adf0c19a09d863e3
 F src/vdbe.h 70e862ac8a11b590f8c1eaac17a0078429d42bc4ea3f757a9af0f451dd966a71
 F src/vdbeInt.h c31ba4dc8d280c2b1dc89c6fcee68f2555e3813ab34279552c20b964c0e338b1
 F src/vdbeapi.c 6cdcbe5c7afa754c998e73d2d5d2805556268362914b952811bdfb9c78a37cf1
-F src/vdbeaux.c 81687c55682b9f4d942186695f4f7fa4743c564a985e0889def52eded9076d61
+F src/vdbeaux.c 5387185849ef00062a5e84af731704e4bf5ec156d82cf5e509a442e9c03e089b
 F src/vdbeblob.c b3f0640db9642fbdc88bd6ebcc83d6009514cafc98f062f675f2c8d505d82692
 F src/vdbemem.c efacb8f229422d2a4db0ed38e49b7f3897862a98d82b261aa3b43d7a2d98c6da
 F src/vdbesort.c b69220f4ea9ffea5fdef34d968c60305444eea909252a81933b54c296d9cca70
@@ -2197,8 +2197,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee
 F tool/warnings.sh a554d13f6e5cf3760f041b87939e3d616ec6961859c3245e8ef701d1eafc2ca2
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
 F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c
-P 4609ba34b8b4a6df4cd28e39d19f96e59580db0e838f1aa605cc00ea003c2a85
-R ef99f5128a13f6e0e0691d2c36c077e8
-U stephan
-Z db7408842f3f5a03e701ec77d60fda32
+P a76682a3b1d6c5e8ca16caf8afbe545c9ae39849fe21ba68d4cddae683a409b5
+R f7e468495da190f853f83c8387119ac3
+U drh
+Z a1864d139eb25bf1c5450994142a23e5
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index b50d78d4e3..972b7f85fc 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a76682a3b1d6c5e8ca16caf8afbe545c9ae39849fe21ba68d4cddae683a409b5
+e065c019d29d4e82a21a89984b86c1811c2b1bdd4663c792857cf89ea2cd91c3
diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index 9448b68f1f..b990b0b5ef 100644
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -5450,12 +5450,12 @@ static int vdbeIsMatchingIndexKey(
 ){
   u8 *aRec = 0;
   u32 nRec = 0;
-  Mem mem;
+  Mem m;
   int rc = SQLITE_OK;
 
-  memset(&mem, 0, sizeof(mem));
-  mem.enc = p->pKeyInfo->enc;
-  mem.db = p->pKeyInfo->db;
+  memset(&m, 0, sizeof(m));
+  m.enc = p->pKeyInfo->enc;
+  m.db = p->pKeyInfo->db;
   nRec = sqlite3BtreePayloadSize(pCur);
   if( nRec>0x7fffffff ){
     return SQLITE_CORRUPT_BKPT;
@@ -5497,9 +5497,9 @@ static int vdbeIsMatchingIndexKey(
         if( (idxRec+nSerial)>nRec ){
           rc = SQLITE_CORRUPT_BKPT;
         }else{
-          sqlite3VdbeSerialGet(&aRec[idxRec], iSerial, &mem);
-          if( vdbeSkipField(mask, ii, &p->aMem[ii], &mem, bInt)==0 ){
-            res = sqlite3MemCompare(&mem, &p->aMem[ii], p->pKeyInfo->aColl[ii]);
+          sqlite3VdbeSerialGet(&aRec[idxRec], iSerial, &m);
+          if( vdbeSkipField(mask, ii, &p->aMem[ii], &m, bInt)==0 ){
+            res = sqlite3MemCompare(&m, &p->aMem[ii], p->pKeyInfo->aColl[ii]);
             if( res!=0 ) break;
           }
         }