1
0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-16 23:02:26 +03:00

Fix a link error and warning that can occur in where.c when compiling under MSVC with SQLITE_OMIT_VIRTUALTABLE defined. Ticket #3914. (CVS 6767)

FossilOrigin-Name: 793c93be16af535e102dba147125384f6814cf5f
This commit is contained in:
shane
2009-06-16 14:15:22 +00:00
parent 0d7d3a3315
commit e26fa4c959
3 changed files with 15 additions and 10 deletions

View File

@@ -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.407 2009/06/15 16:27:08 shane Exp $
** $Id: where.c,v 1.408 2009/06/16 14:15:22 shane Exp $
*/
#include "sqliteInt.h"
@@ -2233,6 +2233,7 @@ static void bestIndex(
ExprList *pOrderBy, /* The ORDER BY clause */
WhereCost *pCost /* Lowest cost query plan */
){
#ifndef SQLITE_OMIT_VIRTUALTABLE
if( IsVirtual(pSrc->pTab) ){
sqlite3_index_info *p = 0;
bestVirtualIndex(pParse, pWC, pSrc, notReady, pOrderBy, pCost, &p);
@@ -2240,7 +2241,9 @@ static void bestIndex(
sqlite3_free(p->idxStr);
}
sqlite3DbFree(pParse->db, p);
}else{
}else
#endif
{
bestBtreeIndex(pParse, pWC, pSrc, notReady, pOrderBy, pCost);
}
}
@@ -3216,9 +3219,11 @@ WhereInfo *sqlite3WhereBegin(
assert( pWC->vmask==0 && pMaskSet->n==0 );
for(i=0; i<pTabList->nSrc; i++){
createMask(pMaskSet, pTabList->a[i].iCursor);
#ifndef SQLITE_OMIT_VIRTUALTABLE
if( ALWAYS(pTabList->a[i].pTab) && IsVirtual(pTabList->a[i].pTab) ){
pWC->vmask |= ((Bitmask)1 << i);
}
#endif
}
#ifndef NDEBUG
{