Fix bug in transfer of arguments from WHERE clause to virtual table xFilter() methods...

FossilOrigin-Name: cf41f2a33f94c6c94fb39ae6ffcd58bbf9ea88c8

diff --git a/manifest b/manifest
index 85f671f9f8a351906392830c19d7edc231e72cd5..9c54d26f51065e1af22539ef97976367824b9896 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Move\solder\snews\sitems\r\nto\sthe\soldnews.html\spage.\s(CVS\s3304)
-D 2006-06-27T11:14:13
+C Fix\sbug\sin\stransfer\sof\sarguments\sfrom\sWHERE\sclause\sto\svirtual\stable\sxFilter()\smethods.\s(CVS\s3305)
+D 2006-06-27T12:16:56
 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 aab29cf7a59d73f83efc0851e8f5c4e90e095e64
+F src/where.c a5d5cec9b57fc35e24a538c677bd7607e4aa5d43
 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 6521ee5f320e47f8fbd7d6b23929fab431023483
-R 94079b24dd5b629652ba782053290e98
-U drh
-Z b56a36b2fc50729ff0ac932ffe779d5a
+P 80163ded7d7a8d6897b59df988286f987b221d08
+R 92ef8332c4454ad08c23a0d99eed847a
+U danielk1977
+Z 897e2d4eed2cdcbe8bf33e402c2b5888

diff --git a/manifest.uuid b/manifest.uuid
index 7b7a83731b9580f4622ab2617c7fd3ce17f05239..0e4bbd3e57d8da90b14eebba1b80b602ebf64a1d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-80163ded7d7a8d6897b59df988286f987b221d08
\ No newline at end of file
+cf41f2a33f94c6c94fb39ae6ffcd58bbf9ea88c8
\ No newline at end of file

diff --git a/src/where.c b/src/where.c
index b6b748d5a25e9eca04efc3e841372e27c0797e1b..b3e383d1f4d18517f0fdb0cb046645a082d3b534 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.226 2006/06/27 02:36:58 drh Exp $
+** $Id: where.c,v 1.227 2006/06/27 12:16:56 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 
@@ -2045,7 +2045,7 @@ WhereInfo *sqlite3WhereBegin(
         int k;
         for(k=0; k<nConstraint; k++){
           if( aUsage[k].argvIndex==j ){
-            int iTerm = aConstraint[j-1].iTermOffset;
+            int iTerm = aConstraint[k].iTermOffset;
             sqlite3ExprCode(pParse, wc.a[iTerm].pExpr->pRight);
             break;
           }