Replace an always-false conditional with an assert().

FossilOrigin-Name: 981b9943e4b2b660690ec1ac145abdd3c74f8dd2
This commit is contained in:
drh 2012-10-09 01:23:25 +00:00
parent c31c7c1c6e
commit 69a76bad73
3 changed files with 8 additions and 10 deletions

View File

@ -1,5 +1,5 @@
C Changes\sto\sfacilitate\sfull\stest\scoverage.
D 2012-10-08T23:25:07.490
C Replace\san\salways-false\sconditional\swith\san\sassert().
D 2012-10-09T01:23:25.030
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in 5f4f26109f9d80829122e0e09f9cda008fa065fb
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@ -249,7 +249,7 @@ F src/vtab.c c7671587d07b76582c495d9305b35c0172cad5d3
F src/wal.c e1fe8f92a0ea0fef8faa87ec43a127a478589d22
F src/wal.h 29c197540b19044e6cd73487017e5e47a1d3dac6
F src/walker.c 3d75ba73de15e0f8cd0737643badbeb0e002f07b
F src/where.c 56916abbd9572487713df7dd41a7cace9e5fae2a
F src/where.c 50d1d0d3e62a561e8e3057d90f0ff5506a115690
F test/8_3_names.test 631ea964a3edb091cf73c3b540f6bcfdb36ce823
F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
F test/aggnested.test 0be144b453e0622a085fae8665c32f5676708e00
@ -1019,7 +1019,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9
P c027a9af9137f3346dbb5c5e100a087c2e89797b
R 7421bd1f29e4f1c03e6a7c48cc004fd6
P 28d1eb40bfc4c993010ce670ee10780ca2ae5c9c
R c49291c07fb5c66de29c1d2358325d86
U drh
Z d39c58ca060ec602a0c6c79ebdb80011
Z d8af7ea73f1923e9b2fa65f8c9082c37

View File

@ -1 +1 @@
28d1eb40bfc4c993010ce670ee10780ca2ae5c9c
981b9943e4b2b660690ec1ac145abdd3c74f8dd2

View File

@ -2733,9 +2733,7 @@ static int isOrderedColumn(
if( (pLevel->plan.wsFlags & WHERE_ALL_UNIQUE)!=0 ){
return 1;
}
if( (pLevel->plan.wsFlags & WHERE_ORDERED)==0 ){
return 0;
}
assert( (pLevel->plan.wsFlags & WHERE_ORDERED)!=0 );
if( (pIdx = pLevel->plan.u.pIdx)!=0 ){
if( iCol<0 ){
sortOrder = 0;