/ Check-in [64a869ad]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fix a harmless compiler warning in the FTS4 logic.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 64a869ad2388d9d62601b93d5139f2dc57f260f7
User & Date: drh 2014-05-27 11:54:48
Context
2014-05-27
15:21
Remove unused code (previously #ifdef-ed out) from btree.c. check-in: 8bc97371 user: drh tags: trunk
11:54
Fix a harmless compiler warning in the FTS4 logic. check-in: 64a869ad user: drh tags: trunk
11:42
Add a test to whereI.test that uses a multi-column PK. check-in: aa183e60 user: dan tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to ext/fts3/fts3_expr.c.

   498    498         pParse->nNest++;
   499    499         rc = fts3ExprParse(pParse, zInput+1, nInput-1, ppExpr, &nConsumed);
   500    500         if( rc==SQLITE_OK && !*ppExpr ){ rc = SQLITE_DONE; }
   501    501         *pnConsumed = (int)(zInput - z) + 1 + nConsumed;
   502    502         return rc;
   503    503       }else if( *zInput==')' ){
   504    504         pParse->nNest--;
   505         -      *pnConsumed = (zInput - z) + 1;
          505  +      *pnConsumed = (int)((zInput - z) + 1);
   506    506         *ppExpr = 0;
   507    507         return SQLITE_DONE;
   508    508       }
   509    509     }
   510    510   
   511    511     /* If control flows to this point, this must be a regular token, or 
   512    512     ** the end of the input. Read a regular token using the sqlite3_tokenizer