Fix compiler warnings.

FossilOrigin-Name: 3e8ac46918c68723bd199dbec8b0901457d524a9

diff --git a/manifest b/manifest
index 299b950889bf8e1e462a5b12eefb12df90c9298f..c6e1871a025fbf6ebc8366eae017057e4733f6be 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Comment\stweaks\sin\swhere.c.\s\sNo\schanges\sto\scode.
-D 2013-06-14T13:27:01.630
+C Fix\scompiler\swarnings.
+D 2013-06-15T15:11:45.875
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -215,7 +215,7 @@ F src/printf.c bff529ed47657098c55c9910b9c69b1b3b1a1353
 F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
 F src/resolve.c 89f9003e8316ee3a172795459efc2a0274e1d5a8
 F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
-F src/select.c 588ae13fc3d10dc812a0832fd143374583beb847
+F src/select.c 94a755b3d3788cf171c98064f2fa0ce6350fd6ca
 F src/shell.c ab6eea968c8745be3aa74e45fedb37d057b4cd0d
 F src/sqlite.h.in 5b390ca5d94e09e56e7fee6a51ddde4721b89f8e
 F src/sqlite3.rc fea433eb0a59f4c9393c8e6d76a6e2596b1fe0c0
@@ -289,7 +289,7 @@ F src/vtab.c b05e5f1f4902461ba9f5fc49bb7eb7c3a0741a83
 F src/wal.c 436bfceb141b9423c45119e68e444358ee0ed35d
 F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
 F src/walker.c 4fa43583d0a84b48f93b1e88f11adf2065be4e73
-F src/where.c cd2ee239c40ef7ffc952e176bfb98ff13a638b20
+F src/where.c df0d274ff134fab313f576f232e586756339e7a1
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
 F test/aggnested.test 45c0201e28045ad38a530b5a144b73cd4aa2cfd6
@@ -1096,7 +1096,7 @@ F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P b920bb70bb009b7c54e7667544c9810c5ee25e19
-R 382f7260a0330db641dd26f80cde0534
+P cecc5fdd5d8fbad7d9e8c275b9ba9ade3dbee8ef
+R ef11f7373ad17a9fe10dde15795cd3f5
 U drh
-Z 568b215d3c8e178d6fdb12bf215bc7ae
+Z 56f2db275e8c6ae6e91e7c2a5db315eb

diff --git a/manifest.uuid b/manifest.uuid
index 6a7fb20d1e9bb661700902c3e960264c3e0140f7..f8be3938950ab9060b5d7a7d975b60cc5b4cd1c8 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-cecc5fdd5d8fbad7d9e8c275b9ba9ade3dbee8ef
\ No newline at end of file
+3e8ac46918c68723bd199dbec8b0901457d524a9
\ No newline at end of file

diff --git a/src/select.c b/src/select.c
index 8972faacc669a4a980a78e783e1333c7d44a09d6..0c706bdbc2f2933401d8696c4961402eaeab9219 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -1538,8 +1538,8 @@ static void computeLimitRegisters(Parse *pParse, Select *p, int iBreak){
       VdbeComment((v, "LIMIT counter"));
       if( n==0 ){
         sqlite3VdbeAddOp2(v, OP_Goto, 0, iBreak);
-      }else{
-        if( p->nSelectRow > n ) p->nSelectRow = n;
+      }else if( n>=0 && p->nSelectRow>(u64)n ){
+        p->nSelectRow = n;
       }
     }else{
       sqlite3ExprCode(pParse, p->pLimit, iLimit);
@@ -1733,7 +1733,7 @@ static int multiSelect(
       p->nSelectRow += pPrior->nSelectRow;
       if( pPrior->pLimit
        && sqlite3ExprIsInteger(pPrior->pLimit, &nLimit)
-       && p->nSelectRow > nLimit 
+       && nLimit>0 && p->nSelectRow > (u64)nLimit 
       ){
         p->nSelectRow = nLimit;
       }

diff --git a/src/where.c b/src/where.c
index 33370c383faaa892ea188e9fe8b7c8a734806511..7777d7e8787576aeeb9514f95cb936817647aa07 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -2927,8 +2927,6 @@ static int codeEqualityTerm(
 static int codeAllEqualityTerms(
   Parse *pParse,        /* Parsing context */
   WhereLevel *pLevel,   /* Which nested loop of the FROM we are coding */
-  WhereClause *pWC,     /* The WHERE clause */
-  Bitmask notReady,     /* Which parts of FROM have not yet been coded */
   int bRev,             /* Reverse the order of IN operators */
   int nExtraReg,        /* Number of extra registers to allocate */
   char **pzAff          /* OUT: Set to point to affinity string */
@@ -3475,9 +3473,7 @@ static Bitmask codeOneLoopStart(
     ** and store the values of those terms in an array of registers
     ** starting at regBase.
     */
-    regBase = codeAllEqualityTerms(
-        pParse, pLevel, pWC, notReady, bRev, nExtraReg, &zStartAff
-    );
+    regBase = codeAllEqualityTerms(pParse,pLevel,bRev,nExtraReg,&zStartAff);
     zEndAff = sqlite3DbStrDup(pParse->db, zStartAff);
     addrNxt = pLevel->addrNxt;
 
@@ -4568,8 +4564,7 @@ static int whereLoopAddBtree(
 ** pBuilder->pNew->iTab.  That table is guaranteed to be a virtual table.
 */
 static int whereLoopAddVirtual(
-  WhereLoopBuilder *pBuilder,  /* WHERE clause information */
-  Bitmask mExtra               /* Extra prerequesites for using this table */
+  WhereLoopBuilder *pBuilder   /* WHERE clause information */
 ){
   WhereInfo *pWInfo;           /* WHERE analysis context */
   Parse *pParse;               /* The parsing context */
@@ -4779,7 +4774,7 @@ static int whereLoopAddOr(WhereLoopBuilder *pBuilder, Bitmask mExtra){
         sBest.rRun = 0;
 #ifndef SQLITE_OMIT_VIRTUALTABLE
         if( IsVirtual(pItem->pTab) ){
-          rc = whereLoopAddVirtual(&sSubBuild, mExtra);
+          rc = whereLoopAddVirtual(&sSubBuild);
         }else
 #endif
         {
@@ -4836,7 +4831,7 @@ static int whereLoopAddAll(WhereLoopBuilder *pBuilder){
     }
     priorJoinType = pItem->jointype;
     if( IsVirtual(pItem->pTab) ){
-      rc = whereLoopAddVirtual(pBuilder, mExtra);
+      rc = whereLoopAddVirtual(pBuilder);
     }else{
       rc = whereLoopAddBtree(pBuilder, mExtra);
     }