diff --git a/manifest b/manifest index 785cbc5aae..fb4bd6518b 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Update\sthe\sauthorizer\saction\scode\sdocumentation\sto\smake\sit\sclear\sthat\nstring\sarguments\sto\sthe\sauthorizer\scallback\scan\sbe\sin\san\sarbitrary\scase. -D 2026-08-31T20:43:10.952 +C Make\ssure\sthe\sextra\ssorting\scursor\sused\sby\sSQLITE_ENABLE_SORTER_REFERENCES\nis\sinitialized\seven\sif\sthe\scorresponding\stable\sis\sempty.\n[bugs:/info/2026-09-01T01:34:02Z|Bug\s2026-09-01T01:34:02Z] +D 2026-09-01T12:36:03.322 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -743,7 +743,7 @@ F src/printf.c 1ee57184d4b8f36333f6b5a9904984594b977798aaeee76a39103a99436e794c F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c F src/resolve.c 0e0990f60c93db38c735d85e5d1741130e72dd0670aec204b5a39118b53c8044 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97 -F src/select.c b892e51e401fc0ba5b9943a3b91d0306113491f1755d65e824e087b663597962 +F src/select.c 9943a496f5847fe66cd74b7fb4270d6ec4d10a5112369cec6fde02baacbc742f F src/shell.c.in 0489afff97ae362c2d2bfa463387ad5625481a3d1561f5ce5871179130bf92e1 F src/sqlite.h.in 5941ea0c99996ecc54ff02835e89d12fd6195fa92b285f73b55a55fdcd90efe9 F src/sqlite3.rc 015537e6ac1eec6c7050e17b616c2ffe6f70fca241835a84a4f0d5937383c479 @@ -1523,7 +1523,7 @@ F test/pcache.test c8acbedd3b6fd0f9a7ca887a83b11d24a007972b F test/pcache2.test 8a801d2b8e4b0ebb99701f026a67a9e84634c8aa24799a842c44003b93250da1 F test/pendingrace.test e99efc5ab3584da3dfc8cd6a0ec4e5a42214820574f5ea24ee93f1d84655f463 F test/percentile.test fd78896fa882fa4fbf693640097859721f3629926c2ccf804af5bcb7001fd35b -F test/permutations.test 2fbe05e34e126b9a40080454404ea8d08e4805b49623e9524ea5d0a84c5c7c55 +F test/permutations.test 1fd848d38291131d0c7eed41321311ee5d58ae5b7ce6f37a3d79ebaff7e1b95c F test/pg_common.tcl 3b27542224db1e713ae387459b5d117c836a5f6e328846922993b6d2b7640d9f F test/pragma.test 7d07b7bb76e273215d6a20c4f83c3062cc28976c737ccb70a686025801e86c8f F test/pragma2.test e5d5c176360c321344249354c0c16aec46214c9f @@ -1606,7 +1606,7 @@ F test/schemafault.test 1936bceca55ac82c5efbcc9fc91a1933e45c8d1e1d106b9a7e56c972 F test/securedel.test 2f70b2449186a1921bd01ec9da407fbfa98c3a7a5521854c300c194b2ff09384 F test/securedel2.test 2d54c28e46eb1fd6902089958b20b1b056c6f1c5 F test/seekscan1.test 2148a174ba55fa378f18fdf62eeed1f3a3cc9b6f360a948db613cad0c80b1f04 -F test/select1.test f5afdbe971a9dd05f0c094d44eb7ee157d61326e7e15357a2a84f20e6937ed52 +F test/select1.test ee7b212594c417aae19b7e668e2310ccb53e1ec022ccd1de5f0b9a695c4f5db5 F test/select2.test 352480e0e9c66eda9c3044e412abdf5be0215b56 F test/select3.test 152ce3978c8600c70413e921e39e4c5aeb8ff1e96dd722442a9981e1b8afc702 F test/select4.test 21941409ac6b65bfca83de020afb5d976d802d3d8ad216dc774a3fbbf55fe277 @@ -2219,8 +2219,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee F tool/warnings.sh a554d13f6e5cf3760f041b87939e3d616ec6961859c3245e8ef701d1eafc2ca2 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c -P f847298c8d4240711e4e12f256941dcf3d5978c53da3a6836cdc675c3468c179 -R 373bddd18efa54afe3106e82a0edad15 +P 6f73383647fdf579dca72e15cc8a9627be72fd524e8e843e7d62dfc9253e20d2 +R 47730e78b477d63ef98769fc107189d7 U drh -Z 30181c6e695384240d7949342b7d2c20 +Z ce2a09c9a551ecf3de70212ee2494115 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index aa9f57ac47..3f16ff8916 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -6f73383647fdf579dca72e15cc8a9627be72fd524e8e843e7d62dfc9253e20d2 +a418005ba503e65944808a5a8397359210293bcde4c5ddd8800c66ea5c103292 diff --git a/src/select.c b/src/select.c index 4f49d0a690..6537d2f930 100644 --- a/src/select.c +++ b/src/select.c @@ -1772,6 +1772,9 @@ static void generateSortTail( Table *pTab = pSort->aDefer[i].pTab; int iDb = sqlite3SchemaToIndex(pParse->db, pTab->pSchema); sqlite3OpenTable(pParse, pSort->aDefer[i].iCsr, iDb, pTab, OP_OpenRead); + sqlite3VdbeAddOp2(v, OP_Rewind, pSort->aDefer[i].iCsr, + sqlite3VdbeCurrentAddr(v)+1); + VdbeCoverage(v); nRefKey = MAX(nRefKey, pSort->aDefer[i].nKey); } #endif diff --git a/test/permutations.test b/test/permutations.test index d37767b907..91c41adef7 100644 --- a/test/permutations.test +++ b/test/permutations.test @@ -1100,7 +1100,7 @@ test_suite "sorterref" -prefix "" -description { ] -initialize { catch {db close} sqlite3_shutdown - sqlite3_config_sorterref 0 + sqlite3_config_sorterref 50 sqlite3_initialize autoinstall_test_functions } -shutdown { diff --git a/test/select1.test b/test/select1.test index 385970d49f..1177cc1d48 100644 --- a/test/select1.test +++ b/test/select1.test @@ -1231,4 +1231,16 @@ do_execsql_test select1-22.4 { SELECT a FROM t1 UNION SELECT b FROM t2 LIMIT 2; } {1 2} +# Bug 2026-09-01T01:34:02Z +# +do_execsql_test select1-23.1 { + DROP TABLE t1; + CREATE TABLE t1(xx,yy CHAR(100)); + INSERT INTO t1(xx) VALUES(0); + SELECT COUNT() FROM t1 AS a0 + WHERE (SELECT a0.yy FROM t1 + WHERE a0.xx LIKE '' ORDER BY 8000000000 ) + ORDER BY 8000000000; +} 0 + finish_test