1
0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-16 23:02:26 +03:00

Fix an obsolete assert().

FossilOrigin-Name: 221e021077e2bbce693a89a16361418ced20f4e8f5a27e8c461648cff663a2c5
This commit is contained in:
drh
2020-07-14 01:51:53 +00:00
parent 9d575e46f3
commit 6e4b140e94
3 changed files with 9 additions and 8 deletions

View File

@@ -1,6 +1,6 @@
B 7a876209a678a34c198b54ceef9e3c041f128a14dc73357f6a57cadadaa6cf7b
C Merge\slatest\schanges\sfrom\strunk.\s\sThis\sbranch\sstill\sdoes\snot\swork.
D 2020-07-14T01:03:05.378
C Fix\san\sobsolete\sassert().
D 2020-07-14T01:51:53.828
F Makefile.in 19374a5db06c3199ec1bab71ab74a103d8abf21053c05e9389255dc58083f806
F Makefile.msc 48f5a3fc32672c09ad73795749f6253e406a31526935fbbffd8f021108d54574
F autoconf/Makefile.am a8d1d24affe52ebf8d7ddcf91aa973fa0316618ab95bb68c87cabf8faf527dc8
@@ -31,7 +31,7 @@ F src/update.c 6a0484134635f167594d597a33d186051125d3ef41803a90b246cea6cf7f11f9
F src/util.c c0bacc165f46169d2b720c37c8719165e383211698fad1de39dd16a8c161815a
F src/vdbe.c 981666c49d33039df6dc9fccd40191575586ac4866255b2f57819cc5eb99f572
F src/vdbeapi.c c1a9004ac554d8d48794d2ce5f80397f8e419fd28643a543cc1e004c7713c3ef
F src/where.c a485bc1ec23b04ef6e7868abc559b8adc4c3fdc3314222386928b2e47f1e4505
F src/where.c 101a366c2bea8a92780e65fe8e6d7946bfb450fba3151815e8685e6f9434102e
F src/window.c 0dec178bfa541c757d15a2be78f34aea36393a0966600366810e5f8739ccf370
F test/altertab.test b8b2104212e8ea87c75c3cbe3cb78ed7236a6c828ee2e59ed09d3dbe9812d002
F test/busy2.test 415364312743992641f9bf679c84918327296067f85a5d00012b339dc35acbd7
@@ -52,7 +52,7 @@ F tool/mksqlite3c.tcl f4ef476510eca4124c874a72029f1e01bc54a896b1724e8f9eef0d8bfa
F tool/mksqlite3h.tcl 1f5e4a1dbbbc43c83cc6e74fe32c6c620502240b66c7c0f33a51378e78fc4edf
F tool/showlocks.c 9cc5e66d4ebbf2d194f39db2527ece92077e86ae627ddd233ee48e16e8142564
F tool/speed-check.sh 615cbdf50f1409ef3bbf9f682e396df80f49d97ed93ed3e61c8e91fae6afde58
P 4a64c16fb7a07431e534fb9bbcf778646be8a1c718d5d10873fbccb0c867aac7 9cb03beae42d814a1b1b69f72865fde502d3f443313ec29edd010d1de40225eb
R b5d39bb30ff84871e9397d6d2ffce041
P 6144387238c03b8b33ae98d624f7ffa44a7829d3e0d4a0a01b5528e71ab4f08b
R 09e6c9be30ecf43ad00b05e365a92997
U drh
Z cf6e9dd9fd5e835801e651e2c806ed31
Z 06ab4065cbe25e9b13e8388937cdaf63

View File

@@ -1 +1 @@
6144387238c03b8b33ae98d624f7ffa44a7829d3e0d4a0a01b5528e71ab4f08b
221e021077e2bbce693a89a16361418ced20f4e8f5a27e8c461648cff663a2c5

View File

@@ -3778,7 +3778,8 @@ static i8 wherePathSatisfiesOrderBy(
/* IN terms are only valid for sorting in the ORDER BY LIMIT
** optimization, and then only if they are actually used
** by the query plan */
assert( wctrlFlags & WHERE_ORDERBY_LIMIT );
assert( wctrlFlags &
(WHERE_ORDERBY_LIMIT|WHERE_ORDERBY_MIN|WHERE_ORDERBY_MAX) );
for(j=0; j<pLoop->nLTerm && pTerm!=pLoop->aLTerm[j]; j++){}
if( j>=pLoop->nLTerm ) continue;
}