Make sure that MATCH terms that a virtual table says should be omitted

really are omitted. (CVS 3302)

FossilOrigin-Name: 3e1f5567dfd306bdb97275a32afd02ea693eaf58

diff --git a/manifest b/manifest
index 7bb211cfd35c2f236aac83cc35e80557253027b0..a4d98cd067a26be7229a63cc3c49811a44a4327f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Cleanup\sand\srefactor\sparts\sof\sthe\soptimizer.\s(CVS\s3301)
-D 2006-06-27T02:33:40
+C Make\ssure\sthat\sMATCH\sterms\sthat\sa\svirtual\stable\ssays\sshould\sbe\somitted\nreally\sare\somitted.\s(CVS\s3302)
+D 2006-06-27T02:36:58
 F Makefile.in f839b470345d3cb4b0644068474623fe2464b5d3
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -105,7 +105,7 @@ F src/vdbeaux.c bb0a7b800a7167f2e49702a2bfc971919c0b99d1
 F src/vdbefifo.c 9efb94c8c3f4c979ebd0028219483f88e57584f5
 F src/vdbemem.c 5f0afe3b92bb2c037f8d5d697f7c151fa50783a3
 F src/vtab.c 4751954e26e9caa6ce3ea5ad9468bd34f07d1de7
-F src/where.c f794d15f5f0503b7b5cdb3fa49fd1f76c015e80d
+F src/where.c aab29cf7a59d73f83efc0851e8f5c4e90e095e64
 F tclinstaller.tcl 046e3624671962dc50f0481d7c25b38ef803eb42
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
 F test/all.test 5df90d015ca63fcef2a4b62c24f7316b66c4bfd4
@@ -374,7 +374,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 28413cf2b3f0e6f294e1f3c59fcce135b65c294f
-R 241cba895df62f4aae2eec3dd91bf438
+P 6609c25fbfa5ad7f55c356936abb1721686c47ca
+R 9a37bd9cfc6a740924847839bd916ca2
 U drh
-Z e0a333826629d40e18f9e44a948284ff
+Z 248f4b236a3fad27fa975dbb4d0967d3

diff --git a/manifest.uuid b/manifest.uuid
index 145605a475dd86f8e442452f512c5cfebe3c4e43..6724a1a93a270550103295d03aba19cbe080f00b 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6609c25fbfa5ad7f55c356936abb1721686c47ca
\ No newline at end of file
+3e1f5567dfd306bdb97275a32afd02ea693eaf58
\ No newline at end of file

diff --git a/src/where.c b/src/where.c
index 0493f715270bd11e1cfa24f18bd4bd2b3ebef96c..b6b748d5a25e9eca04efc3e841372e27c0797e1b 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -16,7 +16,7 @@
 ** so is applicable.  Because this module is responsible for selecting
 ** indices, you might also think of this module as the "query optimizer".
 **
-** $Id: where.c,v 1.225 2006/06/27 02:33:40 drh Exp $
+** $Id: where.c,v 1.226 2006/06/27 02:36:58 drh Exp $
 */
 #include "sqliteInt.h"
 
@@ -804,7 +804,7 @@ or_not_possible:
       pNewTerm->leftColumn = pLeft->iColumn;
       pNewTerm->eOperator = WO_MATCH;
       pNewTerm->iParent = idxTerm;
-      pTerm = &pWC->a[idxNew];
+      pTerm = &pWC->a[idxTerm];
       pTerm->nChild = 1;
       pTerm->flags |= TERM_COPIED;
       pNewTerm->prereqAll = pTerm->prereqAll;