database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-14 00:22:38 +03:00
Code Activity

Remove unreachable code that was added by the fix to the "(xANDy)OR(z)" bug

Browse Source 
in the previous check-in.

FossilOrigin-Name: 04915562a0c2cb377bc7baa0c06c5d9ac376563c
This commit is contained in:
drh
2009-12-16 23:43:55 +00:00
parent c01a3c1775
commit b057e56f22
3 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
manifest
View File

@@ -1,8 +1,8 @@
-----BEGIN PGP SIGNED MESSAGE----- -----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1 Hash: SHA1
C Ensure\sWHERE\sclause\sterms\sinvolving\stables\son\sthe\sright\send\sof\sa\sjoin\nare\snot\sprematurely\sevaluated\swhen\stables\son\sthe\sleft\send\sof\sthe\sjoin\nmake\suse\sof\sthe\sOR-clause\soptimization.\s\s\nFix\sfor\sticket\s[31338dca7e]. C Remove\sunreachable\scode\sthat\swas\sadded\sby\sthe\sfix\sto\sthe\s"(xANDy)OR(z)"\sbug\nin\sthe\sprevious\scheck-in.
D 2009-12-16T22:10:49 D 2009-12-16T23:43:55
F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
F Makefile.in c5827ead754ab32b9585487177c93bb00b9497b3 F Makefile.in c5827ead754ab32b9585487177c93bb00b9497b3
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -222,7 +222,7 @@ F src/vdbemem.c 1e16e3a16e55f4c3452834f0e041726021aa66e0
F src/vdbetrace.c 864cef96919323482ebd9986f2132435115e9cc2 F src/vdbetrace.c 864cef96919323482ebd9986f2132435115e9cc2
F src/vtab.c 7c7713d66cda699f16bf1cc601d8d4f5070ab935 F src/vtab.c 7c7713d66cda699f16bf1cc601d8d4f5070ab935
F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
F src/where.c 5d057a1054972396c05b5e28e6636359675a60d4 F src/where.c f20ee9a15c1ccb8b94cd31e3f8c6868e1358fc07
F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87 F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
F test/all.test 14165b3e32715b700b5f0cbf8f6e3833dda0be45 F test/all.test 14165b3e32715b700b5f0cbf8f6e3833dda0be45
@@ -783,14 +783,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
P 1ba4f412325fc2ce552ad7feecf93891f7f95059 P 2c2de252666662f5459904fc33a9f2956cbff23c
R 0f0daa13e962576cf0e0e163e05eaf4e R 788e421365d0e76ba399b58405f069c0
U drh U drh
Z 0003328655e85cfcc94ce890d5aea52a Z ec1d76d017fc8850fea3e2efadea4e03
-----BEGIN PGP SIGNATURE----- -----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux) Version: GnuPG v1.4.6 (GNU/Linux)
iD8DBQFLKVrtoxKgR168RlERAuSjAJ9orzNKVuBJ+JkBFgDa9NTlSgG6OwCfYqCf iD8DBQFLKXC+oxKgR168RlERArULAJ9EXPN/43YX+xLi4kYmaBI16MocVQCfd57b
2/3GkgkUHpv1vo5CeiJiOuY= 3yY4D6DwpXWJCHus3nTzzCU=
=yKm6 =FeSr
-----END PGP SIGNATURE----- -----END PGP SIGNATURE-----

2
manifest.uuid
View File

@@ -1 +1 @@
2c2de252666662f5459904fc33a9f2956cbff23c 04915562a0c2cb377bc7baa0c06c5d9ac376563c

4
src/where.c
View File

@@ -3416,9 +3416,7 @@ static Bitmask codeOneLoopStart(
testcase( pTerm->wtFlags & TERM_CODED ); testcase( pTerm->wtFlags & TERM_CODED );
if( pTerm->wtFlags & (TERM_VIRTUAL|TERM_CODED) ) continue; if( pTerm->wtFlags & (TERM_VIRTUAL|TERM_CODED) ) continue;
if( (pTerm->prereqAll & notReady)!=0 ){ if( (pTerm->prereqAll & notReady)!=0 ){
testcase( pWInfo->untestedTerms==0 assert( pWInfo->untestedTerms );
&& (pWInfo->wctrlFlags & WHERE_ONETABLE_ONLY)!=0 );
pWInfo->untestedTerms = 1;
continue; continue;
} }
assert( pTerm->pExpr ); assert( pTerm->pExpr );