The xFilter method is not optional. (CVS 3539)

FossilOrigin-Name: 6fdbd3bc91559ed95314842c0df33adbf276913e

diff --git a/manifest b/manifest
index 2d96c3b2a019c7107e160fdd426a869123beef8b..d9e9b12190b8dd843ef0c8769fd1cfd288b6da83 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Initialize\sa\svariable\sto\savoid\scompiler\swarnings\sand\shuman\sconfusion.\nTicket\s#2117.\s(CVS\s3538)
-D 2006-12-20T14:31:24
+C The\sxFilter\smethod\sis\snot\soptional.\s(CVS\s3539)
+D 2006-12-20T14:53:38
 F Makefile.in 8e14898d41a53033ecb687d93c9cd5d109fb9ae3
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -121,7 +121,7 @@ F src/update.c 951f95ef044cf6d28557c48dc35cb0711a0b9129
 F src/utf.c 67ecb1032bc0b42c105e88d65ef9d9f626eb0e1f
 F src/util.c 91d4cb189476906639ae611927d939691d1365f6
 F src/vacuum.c b620ffff5a84af88b970894a92bb330bd2b9fc45
-F src/vdbe.c b967a1692ca69e05c595d4c25ca14e1a97df8378
+F src/vdbe.c 5a1624c73bed143f3d56d1f0a1a1665763520a99
 F src/vdbe.h 9720cae673359dc2bdcb106285ecf686b7d3ef24
 F src/vdbeInt.h 1ca07f2d7446c90230346aed7fbf990c032460bc
 F src/vdbeapi.c 2d1e6843af8705a1172e54a418d2a3d5febd1dd7
@@ -423,7 +423,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P a81f3ddfd0626ae642c5ffd27a23c568d06f58dc
-R b4376c2c890f2d1c64ba83335f247288
+P 951af8d5c57d665ee2ad3ee09ce34c023aa9e771
+R e84d2ab03b45da8d007e596bdbd94076
 U drh
-Z fa0b105ee6d7dd9bdfaf3037e9f54072
+Z ac3f55661cf3e26616ca3d5b28ea11db

diff --git a/manifest.uuid b/manifest.uuid
index 1281d7b8c4d12b450c8464ffb32d4c853b019ad1..7e01f650be2c9c066157b00b1d83f1eebe8e22f8 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-951af8d5c57d665ee2ad3ee09ce34c023aa9e771
\ No newline at end of file
+6fdbd3bc91559ed95314842c0df33adbf276913e
\ No newline at end of file

diff --git a/src/vdbe.c b/src/vdbe.c
index adc99fd541b457625b485a67940d8842ac520c6f..26e433b9a806cf11eafd56687161217d79ad70ce 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -43,7 +43,7 @@
 ** in this file for details.  If in doubt, do not deviate from existing
 ** commenting and indentation practices when changing or adding code.
 **
-** $Id: vdbe.c,v 1.580 2006/12/20 14:31:24 drh Exp $
+** $Id: vdbe.c,v 1.581 2006/12/20 14:53:38 drh Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
@@ -4642,8 +4642,8 @@ case OP_VFilter: {   /* no-push */
   assert( (pTos[0].flags&MEM_Int)!=0 && pTos[-1].flags==MEM_Int );
   nArg = pTos[-1].i;
 
-  /* Invoke the xFilter method if one is defined. */
-  if( pModule->xFilter ){
+  /* Invoke the xFilter method */
+  {
     int res = 0;
     int i;
     Mem **apArg = p->apArg;