diff --git a/manifest b/manifest index 15680aed8b..ddfe33c972 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Assign\sthe\scorrect\sencoding\sto\sthe\sBLOB\svalues\sread\sfrom\san\soverflow\spage.\n[bugs:/info/2026-10-07T15:44:40Z|Bug\s2026-10-07T15:44:40Z] -D 2026-10-08T03:28:50.240 +C Update\scheck-in\s[e71b0465b9fa13db]\sso\sthat\sit\sdoes\snot\stry\sto\sto\sgenerate\nan\sOP_NullRow\sopcode\sfor\scursors\sof\san\sIN\soperator\sthat\sdo\snot\sactually\nexist. +D 2026-10-08T09:57:08.006 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -883,7 +883,7 @@ F src/vxworks.h 9d18819c5235b49c2340a8a4d48195ec5d5afb637b152406de95a9436beeaeab F src/wal.c 41438914e455bbc42ccff8545eab4c711f91233e480337e44a3d5fdf121fce74 F src/wal.h c6251cfc1950643a976625ca452e46dc9b466b4f5dd2e85f244f29f79bf68ace F src/walker.c d5006d6b005e4ea7302ad390957a8d41ed83faa177e412f89bc5600a7462a014 -F src/where.c aff5a48cab75a7aa74b21de1432554febc0f9191ef1d38a3d9e13d0ae673fd3c +F src/where.c f2a92a7bb2b0e2295c1715a1461a7df2b81d2306cbe4698b78df740dd2ae1aef F src/whereInt.h f039ad303bc2913de673e431821ef8db3b619d249e6e5548d90072a684e72285 F src/wherecode.c 1a6d2999159b28d8c0b968458b90ec183b3813cb332c11515ab60a73db5c07fd F src/whereexpr.c 76f72a95c5cf0e8a8edb679ca4fb7afa17ba45ff4effe73c414266510109e701 @@ -2280,8 +2280,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee F tool/warnings.sh a554d13f6e5cf3760f041b87939e3d616ec6961859c3245e8ef701d1eafc2ca2 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c -P e71b0465b9fa13db3922e767c1d8979d221516475670dcd3fa4df1fab30176c6 -R 3ba57802622c7216dadd15136148181e +P a8895cb047a3aeed35642111fa79bde9db962a5d7bc3f0cc472b4dbe510cb3f9 +R 35c12a6a462a8f190b32d299e9acc1b1 U drh -Z 2592076f203546fc76e2c9f4e228680b +Z 30598d7be2bdf6d4de07633cb55737f0 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 3ca353f04b..d16a8aac80 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -a8895cb047a3aeed35642111fa79bde9db962a5d7bc3f0cc472b4dbe510cb3f9 +ea315175a8076f22f85a57a01c5b490630ab20d5ed80144118ced61c8c24886d diff --git a/src/where.c b/src/where.c index e1c0aac48e..9c6e91a67c 100644 --- a/src/where.c +++ b/src/where.c @@ -7726,7 +7726,10 @@ void sqlite3WhereEnd(WhereInfo *pWInfo){ if( ws & WHERE_IN_ABLE ){ int m; for(m=0; mu.in.nIn; m++){ - sqlite3VdbeAddOp1(v, OP_NullRow, pLevel->u.in.aInLoop[m].iCur); + struct InLoop *pIn = &pLevel->u.in.aInLoop[m]; + if( pIn->eEndLoopOp!=OP_Noop ){ + sqlite3VdbeAddOp1(v, OP_NullRow, pIn->iCur); + } } } if( pLevel->op==OP_Return ){