From: dan <Dan Kennedy>
Date: Tue, 12 Mar 2024 20:10:46 +0000 (+0000)
Subject: Correctly initialize the SrcItem.iCursor field to -1 when creating a co-routine from... 
X-Git-Tag: version-3.46.0~123^2~22
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5badd048d2e63b900683eefd01a3427a3d82b277;p=thirdparty%2Fsqlite.git

Correctly initialize the SrcItem.iCursor field to -1 when creating a co-routine from a multi-values VALUES clause.

FossilOrigin-Name: c32953ff6d72910815eaff29ab1b790c412e1a741d02c03c5911dda0c08e5130
---

diff --git a/manifest b/manifest
index afde134bd1..ae283f24ef 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Attempt\sto\sreduce\sthe\smemory\sused\sby\sVALUES\sclauses\sin\sas\smany\sstatements\sas\spossible,\snot\sjust\sINSERT.\sThis\sbranch\sstill\shas\sproblems.
-D 2024-03-11T17:27:19.668
+C Correctly\sinitialize\sthe\sSrcItem.iCursor\sfield\sto\s-1\swhen\screating\sa\sco-routine\sfrom\sa\smulti-values\sVALUES\sclause.
+D 2024-03-12T20:10:46.651
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -709,7 +709,7 @@ F src/hash.c 9ee4269fb1d6632a6fecfb9479c93a1f29271bddbbaf215dd60420bcb80c7220
 F src/hash.h 3340ab6e1d13e725571d7cee6d3e3135f0779a7d8e76a9ce0a85971fa3953c51
 F src/hwtime.h f9c2dfb84dce7acf95ce6d289e46f5f9d3d1afd328e53da8f8e9008e3b3caae6
 F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
-F src/insert.c 2c34cf51e9d8c00498ba68b7f130e448038bb31f624c9c1ca80fa8e3237b51fb
+F src/insert.c 9d48439a0fff35d3c4850bc9ab3657f9d45b2800af52ef3b083e7068e32d8aa2
 F src/json.c e2e40760d6689134c3e2ece38c6a496b34ff5e2661a8f238444a119af666fdce
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c 7432c944ff197046d67a1207790a1b13eec4548c85a9457eb0896bb3641dfb36
@@ -1921,7 +1921,7 @@ F test/vacuum4.test 7ea76b769fffeb41f925303b04cbcf5a5bbeabe55e4c60ae754ff24eeeb7
 F test/vacuum5.test 263b144d537e92ad8e9ca8a73cc6e1583f41cfd0dda9432b87f7806174a2f48c
 F test/vacuum6.test b137b04bf3392d3f5c3b8fda0ce85a6775a70ca112f6559f74ff52dc9ce042fd
 F test/vacuummem.test 4b30f5b95a9ff86e9d5c20741e50a898b2dc10b0962a3211571eb165357003fb
-F test/values.test 8438dea6826738291ff2019993d62e1eae7a3efb66ea8312fa9ac9bfaf0f95cb
+F test/values.test 042f30d897d3b2bfa54dc89a48ef6c8f6ba3ffdfd4fc35c2cc877d28a1095ce3
 F test/valuesfault.test 2ef23ed965e3bd08e268cdc38a0d11653390ddbbe1e8e2e98d16f55edd30f6e8
 F test/varint.test bbce22cda8fc4d135bcc2b589574be8410614e62
 F test/veryquick.test 57ab846bacf7b90cf4e9a672721ea5c5b669b661
@@ -2179,11 +2179,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 95a9c88b258f18ac671a4c712603931167cc8bd0b86e41481b200c08043338b5
-R 62b6db11e5c879766b23978dd0871f55
-T *branch * exp-values-clause2
-T *sym-exp-values-clause2 *
-T -sym-trunk *
+P 17d1f7cfabc7593d0725051b0c7c9619a23a482265f30f15ab9493fef5caeeb0
+R bc124d03e15c7cb41c52570d66be2e47
 U dan
-Z 521a450017e9a427470d7f09cc068c5e
+Z 476dd3f62c65ec97a150406261356d2a
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 633c59c43c..bc849bef9a 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-17d1f7cfabc7593d0725051b0c7c9619a23a482265f30f15ab9493fef5caeeb0
\ No newline at end of file
+c32953ff6d72910815eaff29ab1b790c412e1a741d02c03c5911dda0c08e5130
\ No newline at end of file
diff --git a/src/insert.c b/src/insert.c
index 7b253e9262..071d9aeff9 100644
--- a/src/insert.c
+++ b/src/insert.c
@@ -635,6 +635,7 @@ Select *sqlite3MultiValues(Parse *pParse, Select *pLeft, ExprList *pRow){
       p->fg.viaCoroutine = 1;
       p->addrFillSub = sqlite3VdbeCurrentAddr(v) + 1;
       p->regReturn = ++pParse->nMem;
+      p->iCursor = -1;
   
       sqlite3VdbeAddOp3(v,OP_InitCoroutine,p->regReturn,0,p->addrFillSub);
       sqlite3SelectDestInit(&dest, SRT_Coroutine, p->regReturn);
diff --git a/test/values.test b/test/values.test
index 66e29ef6f0..8df0e6138f 100644
--- a/test/values.test
+++ b/test/values.test
@@ -252,5 +252,16 @@ do_execsql_test 6.1 {
   SELECT ( VALUES( x ), ( x ) ) FROM t1;
 } {1 2}
 
+#-------------------------------------------------------------------------
+reset_db
+do_execsql_test 6.0 {
+  CREATE TABLE t1(x);
+  INSERT INTO t1 VALUES('x'), ('y');
+}
+
+do_execsql_test 6.1 {
+  SELECT * FROM t1, (VALUES(1), (2))
+} {x 1 x 2 y 1 y 2}
 
 finish_test
+