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

in the previous check-in.

FossilOrigin-Name: 04915562a0c2cb377bc7baa0c06c5d9ac376563c

diff --git a/manifest b/manifest
index 69d6f433ab3b994a569e9c7b881a81873ae3290e..3a17aa593b450882f0c7e695e7373b64a697ea76 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 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].
-D 2009-12-16T22:10:49
+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-16T23:43:55
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in c5827ead754ab32b9585487177c93bb00b9497b3
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -222,7 +222,7 @@ F src/vdbemem.c 1e16e3a16e55f4c3452834f0e041726021aa66e0
 F src/vdbetrace.c 864cef96919323482ebd9986f2132435115e9cc2
 F src/vtab.c 7c7713d66cda699f16bf1cc601d8d4f5070ab935
 F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
-F src/where.c 5d057a1054972396c05b5e28e6636359675a60d4
+F src/where.c f20ee9a15c1ccb8b94cd31e3f8c6868e1358fc07
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
 F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
 F test/all.test 14165b3e32715b700b5f0cbf8f6e3833dda0be45
@@ -783,14 +783,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 1ba4f412325fc2ce552ad7feecf93891f7f95059
-R 0f0daa13e962576cf0e0e163e05eaf4e
+P 2c2de252666662f5459904fc33a9f2956cbff23c
+R 788e421365d0e76ba399b58405f069c0
 U drh
-Z 0003328655e85cfcc94ce890d5aea52a
+Z ec1d76d017fc8850fea3e2efadea4e03
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFLKVrtoxKgR168RlERAuSjAJ9orzNKVuBJ+JkBFgDa9NTlSgG6OwCfYqCf
-2/3GkgkUHpv1vo5CeiJiOuY=
-=yKm6
+iD8DBQFLKXC+oxKgR168RlERArULAJ9EXPN/43YX+xLi4kYmaBI16MocVQCfd57b
+3yY4D6DwpXWJCHus3nTzzCU=
+=FeSr
 -----END PGP SIGNATURE-----

diff --git a/manifest.uuid b/manifest.uuid
index 6ea0ecba5ee19f7888ccecc54796436dcbaea62b..8a33e8224272eebce8fda05abddaea00faea417d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2c2de252666662f5459904fc33a9f2956cbff23c
\ No newline at end of file
+04915562a0c2cb377bc7baa0c06c5d9ac376563c
\ No newline at end of file

diff --git a/src/where.c b/src/where.c
index 90215edd8c43555794cdf30bf924134dfdc3764d..f6d9ab296ed0bf36465da9240c80b12c99e00bc9 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -3416,9 +3416,7 @@ static Bitmask codeOneLoopStart(
       testcase( pTerm->wtFlags & TERM_CODED );
       if( pTerm->wtFlags & (TERM_VIRTUAL|TERM_CODED) ) continue;
       if( (pTerm->prereqAll & notReady)!=0 ){
-        testcase( pWInfo->untestedTerms==0
-               && (pWInfo->wctrlFlags & WHERE_ONETABLE_ONLY)!=0 );
-        pWInfo->untestedTerms = 1;
+        assert( pWInfo->untestedTerms );
         continue;
       }
       assert( pTerm->pExpr );