Rename a shadowed local var, as reported in [forum:2ba65af3148585cf|forum post 2ba65a...

FossilOrigin-Name: d030c87c4d410e9ca2b90ec7cb63e752f4490c60e2feac84f233861593142c7d

diff --git a/manifest b/manifest
index 32bc04aaf58349c0987561659cde01de299272d0..6387c6f73c6bdc94540234efc164d0827d12f433 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\shyperlink\stypo\sin\ssession\sdocumentation.
-D 2024-05-08T11:51:56.927
+C Rename\sa\sshadowed\slocal\svar,\sas\sreported\sin\s[forum:2ba65af3148585cf|forum\spost\s2ba65af31].\sNo\sfunctional\schanges.
+D 2024-05-08T17:57:45.450
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -753,7 +753,7 @@ F src/printf.c 8b250972305e14b365561be5117ed0fd364e4fd58968776df1ce64c6280b90f9
 F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c 8816212645e4e9bdf3cc2f2d298304f388d699f8fab47f3a5712ef5bbc5b6ccc
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
-F src/select.c 04178566d0188be7de471064ced8cec1d407920726cb49b609486282d78faf56
+F src/select.c ce81687d769b174aa547b8216a34fabc9cafc05789b615494ab78dc2c1e799fa
 F src/shell.c.in 0354ca51eee5fbf6af394a7ef9f5ef6823ef45b743db65431f6777e4d5be2199
 F src/sqlite.h.in 32389e0d584551b300d0157881336162c14315a424cbf385c0d65eb7c2e31f7b
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
@@ -2189,8 +2189,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 e29decb8b1991bb586f41fd74bbaa4d6c4bd63e22617145828b2500d697d7869
-R bd6c2a6994b109d4181b29475acc71ca
-U drh
-Z b1677682f99b4b1ca04906a7901df3be
+P 42d67c6fed3a5f21d7b71515aca471ba61d387e620022735a2e7929fa3a237cf
+R 720970f4b793c1274abaf8cd5acc207b
+U stephan
+Z ded7a2dedc55d6033e03441501e1782b
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index d0915126d978ec125c03f31f878e53ca1787a5e0..1393352ef39c43e6150e634fb68aa54a576c2975 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-42d67c6fed3a5f21d7b71515aca471ba61d387e620022735a2e7929fa3a237cf
\ No newline at end of file
+d030c87c4d410e9ca2b90ec7cb63e752f4490c60e2feac84f233861593142c7d
\ No newline at end of file

diff --git a/src/select.c b/src/select.c
index 8ee59cf68a641801fe164c57baa7cdcc36a829fa..532fbd19e5a5fce280955e29ed27b1a34d71c931 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -2381,12 +2381,12 @@ void sqlite3SubqueryColumnTypes(
       }
     }
     if( zType ){
-      i64 m = sqlite3Strlen30(zType);
+      const i64 k = sqlite3Strlen30(zType);
       n = sqlite3Strlen30(pCol->zCnName);
-      pCol->zCnName = sqlite3DbReallocOrFree(db, pCol->zCnName, n+m+2);
+      pCol->zCnName = sqlite3DbReallocOrFree(db, pCol->zCnName, n+k+2);
       pCol->colFlags &= ~(COLFLAG_HASTYPE|COLFLAG_HASCOLL);
       if( pCol->zCnName ){
-        memcpy(&pCol->zCnName[n+1], zType, m+1);
+        memcpy(&pCol->zCnName[n+1], zType, k+1);
         pCol->colFlags |= COLFLAG_HASTYPE;
       }
     }