Changes so that it will build with SQLITE_OMIT_VIRTUALTABLE=1. (CVS 3309)

FossilOrigin-Name: 5612b287059c75488f995625d447c4e9521d1637

diff --git a/manifest b/manifest
index 0b90f8d554a9de63de0ea6d50483d38ebf7627aa..3c7d56fc5dc2758a8cb62114e3a2a851988340d5 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C All\stests\spass\seven\sif\scompiled\swith\s-DSQLITE_DEFAULT_FILE_FORMAT=1.\s(CVS\s3308)
-D 2006-06-27T12:51:13
+C Changes\sso\sthat\sit\swill\sbuild\swith\sSQLITE_OMIT_VIRTUALTABLE=1.\s(CVS\s3309)
+D 2006-06-27T13:20:21
 F Makefile.in f839b470345d3cb4b0644068474623fe2464b5d3
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -93,19 +93,19 @@ F src/test_server.c a6460daed0b92ecbc2531b6dc73717470e7a648c
 F src/test_tclvar.c 0fe60a8a7358f99d5d0c08d6822bd5b1b39b4d58
 F src/tokenize.c 7b448440dfd6e984d6bef7ac7fc60f1d26eaf8e7
 F src/trigger.c 0fc40125820409a6274834a6e04ad804d96e2793
-F src/update.c e3f5b7e9e1008e809248ea98bc76844f9a610f7a
+F src/update.c 951f95ef044cf6d28557c48dc35cb0711a0b9129
 F src/utf.c ab81ac59084ff1c07d421eb1a0a84ec809603b44
-F src/util.c ca6ee72772c0f5dc04d2e0ab1973fd3b6a9bf79d
+F src/util.c 410adf9074b81c58e276a3dd5c1295ef6e5eeda4
 F src/vacuum.c 5b37d0f436f8e1ffacd17934e44720b38d2247f9
 F src/vdbe.c 77679f2e01cb7bbd5087dca96c79116b66119a8f
 F src/vdbe.h 258b5d1c0aaa72192f09ff0568ce42b383f156fa
-F src/vdbeInt.h 37d74cc5651547d76c11682c67286bdf4099b54b
+F src/vdbeInt.h e3eaab262b67b84474625cfc38aec1125c32834b
 F src/vdbeapi.c 6af0e7160af260052a7a4500464221a03dada75f
 F src/vdbeaux.c bb0a7b800a7167f2e49702a2bfc971919c0b99d1
 F src/vdbefifo.c 9efb94c8c3f4c979ebd0028219483f88e57584f5
 F src/vdbemem.c 5f0afe3b92bb2c037f8d5d697f7c151fa50783a3
 F src/vtab.c 4751954e26e9caa6ce3ea5ad9468bd34f07d1de7
-F src/where.c a5d5cec9b57fc35e24a538c677bd7607e4aa5d43
+F src/where.c 75a89957fcb8c068bec55caa4e9d2ed5fa0b0724
 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 a20bfa46316b9d8f884f147960620fc8e56a7c7f
-R fc3aecd43a4bea7082d55ad447974520
+P 8a49311d2f50cf2ca24776cabcb8ec7418325cb1
+R 619d8ee8eb3496bd8b37cd0133ef301c
 U drh
-Z 7793804357a3de2c4882cca76381e1ce
+Z 9dfba4054cb802f88e4ad625f3a30132

diff --git a/manifest.uuid b/manifest.uuid
index 7c4517e7da8c50aeb3cf421f2954148c0ee721da..112d34b2f0f1c234f2f0097fc659b5719f3e7439 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8a49311d2f50cf2ca24776cabcb8ec7418325cb1
\ No newline at end of file
+5612b287059c75488f995625d447c4e9521d1637
\ No newline at end of file

diff --git a/src/update.c b/src/update.c
index 5a8ac92f7df467342bb7b7d7bac83af5ae3aec2e..a9be79621fbe6fca149a8534ced5955d0af4f205 100644 (file)
--- a/src/update.c
+++ b/src/update.c
@@ -12,10 +12,11 @@
 ** This file contains C code routines that are called by the parser
 ** to handle UPDATE statements.
 **
-** $Id: update.c,v 1.132 2006/06/24 11:51:34 danielk1977 Exp $
+** $Id: update.c,v 1.133 2006/06/27 13:20:21 drh Exp $
 */
 #include "sqliteInt.h"
 
+#ifndef SQLITE_OMIT_VIRTUALTABLE
 /* Forward declaration */
 static void updateVirtualTable(
   Parse *pParse,       /* The parsing context */
@@ -26,6 +27,7 @@ static void updateVirtualTable(
   int *aXRef,          /* Mapping from columns of pTab to entries in pChanges */
   Expr *pWhere         /* WHERE clause of the UPDATE statement */
 );
+#endif /* SQLITE_OMIT_VIRTUALTABLE */
 
 /*
 ** The most recently coded instruction was an OP_Column to retrieve the

diff --git a/src/util.c b/src/util.c
index fb13b8297c0dd4b50183ddb8d8e0b25fadf7997e..fe42b3e151bb7a8fc8387a331e6cd5f8ba0a36b9 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -14,7 +14,7 @@
 ** This file contains functions for allocating memory, comparing
 ** strings, and stuff like that.
 **
-** $Id: util.c,v 1.189 2006/04/08 19:14:53 drh Exp $
+** $Id: util.c,v 1.190 2006/06/27 13:20:21 drh Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
@@ -684,11 +684,11 @@ void sqlite3ReallocOrFree(void **pp, int n){
 */
 #ifdef SQLITE_ENABLE_MEMORY_MANAGEMENT
 void *sqlite3ThreadSafeMalloc(int n){
-  ENTER_MALLOC;
+  (void)ENTER_MALLOC;
   return sqlite3Malloc(n, 0);
 }
 void sqlite3ThreadSafeFree(void *p){
-  ENTER_MALLOC;
+  (void)ENTER_MALLOC;
   if( p ){
     OSFREE(p);
   }

diff --git a/src/vdbeInt.h b/src/vdbeInt.h
index cdbc312cb922765e7228e0febd7367bd436d624f..db8034061b58dbd408a2df5370978c45f027e583 100644 (file)
--- a/src/vdbeInt.h
+++ b/src/vdbeInt.h
@@ -83,10 +83,8 @@ struct Cursor {
   KeyInfo *pKeyInfo;    /* Info about index keys needed by index cursors */
   int nField;           /* Number of fields in the header */
   i64 seqCount;         /* Sequence counter */
-#ifndef SQLITE_OMIT_VIRTUALTABLE
   sqlite3_vtab_cursor *pVtabCursor;  /* The cursor for a virtual table */
   const sqlite3_module *pModule;     /* Module for cursor pVtabCursor */
-#endif
 
   /* Cached information about the header for the data record that the
   ** cursor is currently pointing to.  Only valid if cacheValid is true.
@@ -327,15 +325,13 @@ struct Vdbe {
   u8 aborted;             /* True if ROLLBACK in another VM causes an abort */
   u8 expired;             /* True if the VM needs to be recompiled */
   u8 minWriteFileFormat;  /* Minimum file format for writable database files */
+  u8 inVtabMethod;        /* See comments above */
   int nChange;            /* Number of db changes made since last reset */
   i64 startTime;          /* Time when query started - used for profiling */
 #ifdef SQLITE_SSE
   int fetchId;          /* Statement number used by sqlite3_fetch_statement */
   int lru;              /* Counter used for LRU cache replacement */
 #endif
-#ifndef SQLITE_OMIT_VIRTUALTABLE
-  int inVtabMethod;     /* See comments above */
-#endif
 };
 
 /*

diff --git a/src/where.c b/src/where.c
index b3e383d1f4d18517f0fdb0cb046645a082d3b534..89a26f72fb15eee5ec24d81542ccd56118f58ac8 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.227 2006/06/27 12:16:56 danielk1977 Exp $
+** $Id: where.c,v 1.228 2006/06/27 13:20:22 drh Exp $
 */
 #include "sqliteInt.h"
 
@@ -524,6 +524,8 @@ static int isLikeOrGlob(
 }
 #endif /* SQLITE_OMIT_LIKE_OPTIMIZATION */
 
+
+#ifndef SQLITE_OMIT_VIRTUALTABLE
 /*
 ** Check to see if the given expression is of the form
 **
@@ -539,7 +541,8 @@ static int isMatchOfColumn(
   if( pExpr->op!=TK_FUNCTION ){
     return 0;
   }
-  if( pExpr->token.n!=5 || sqlite3StrNICmp(pExpr->token.z,"match",5)!=0 ){
+  if( pExpr->token.n!=5 ||
+       sqlite3StrNICmp((const char*)pExpr->token.z,"match",5)!=0 ){
     return 0;
   }
   pList = pExpr->pList;
@@ -551,6 +554,7 @@ static int isMatchOfColumn(
   }
   return 1;
 }
+#endif /* SQLITE_OMIT_VIRTUALTABLE */
 
 /*
 ** If the pBase expression originated in the ON or USING clause of