Omit a branch that is no longer needed following [c9c4f287652933eb].

FossilOrigin-Name: 960a488a2db92f5437bc8171cdbed44618d9381c57fd41b2f0e357b6012c80b5

diff --git a/manifest b/manifest
index a9320129a3523bb1eb1c0c19a5f32099a6367101..3fada7c74caeb1275f65e9cd1e800c4c96038f71 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\san\serror\sin\snew\stest\sscript\stest/aggfault.test.
-D 2023-03-30T12:19:38.983
+C Omit\sa\sbranch\sthat\sis\sno\slonger\sneeded\sfollowing\s[c9c4f287652933eb].
+D 2023-03-30T16:08:54.466
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -712,7 +712,7 @@ F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
 F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b
 F src/where.c 2bafa1b7d1969d28135e4e7978f578a550d0a5b9005bc5a9180146a3de126880
 F src/whereInt.h e25203e5bfee149f5f1225ae0166cfb4f1e65490c998a024249e98bb0647377c
-F src/wherecode.c 76996676015ee5ad228e8dc4d2631c7e397e912865504f3667fc5a01c2a9c866
+F src/wherecode.c 41c17b089082558c1c5496e8a453b1f9a96485b6b355f318440fca2ee4754b2e
 F src/whereexpr.c 1dfda1695e4480c24248157df55bb4d66c732dc8d14ac16b4f076bb15de93d63
 F src/window.c 76a27cff9ea2ded0c2c3527187029259440fabcc4cc4c07b11d942c78494a614
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
@@ -2052,8 +2052,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 804435a2731bd3c26278c47098854b9ee7727a686587f6208e793738fbfc0555
-R b296eb533e950e069bba30b8ded554ba
-U dan
-Z 3a1b614658fa77d50aaf0b29cb8c8a77
+P 8724fe7426da55d19dba7b30e09321ba30c73286513864cb05de32f72e50ee31
+R 1624b0eb89a914d1ae752ba25df52cd1
+U drh
+Z 7c95356d2ffe255785c95c9a7696e988
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index e53f3ad8147e1e59b544e05be5c531e1cf0f9ed8..1d2da30e598a4cba9d1e6afc343052c8764e3fc5 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8724fe7426da55d19dba7b30e09321ba30c73286513864cb05de32f72e50ee31
\ No newline at end of file
+960a488a2db92f5437bc8171cdbed44618d9381c57fd41b2f0e357b6012c80b5
\ No newline at end of file

diff --git a/src/wherecode.c b/src/wherecode.c
index ac932659904dca237e9b92941db6144ab0b061e1..abb582fb7bfaf904649258009ab83aba8a142d61 100644 (file)
--- a/src/wherecode.c
+++ b/src/wherecode.c
@@ -2002,7 +2002,7 @@ Bitmask sqlite3WhereCodeOneLoopStart(
     if( zEndAff ) sqlite3DbNNFreeNN(db, zEndAff);
 
     /* Top of the loop body */
-    if( pLevel->p2==0 ) pLevel->p2 = sqlite3VdbeCurrentAddr(v);
+    pLevel->p2 = sqlite3VdbeCurrentAddr(v);
 
     /* Check if the index cursor is past the end of the range. */
     if( nConstraint ){