1
0
mirror of https://github.com/sqlite/sqlite.git synced 2025-07-27 20:41:58 +03:00

Reverse commit (6315) for now. (CVS 6317)

FossilOrigin-Name: 0e7c369c23a8767b4d3e5cdd47c14716992fb71a
This commit is contained in:
danielk1977
2009-02-24 10:14:40 +00:00
parent a55331620e
commit 2d2e7bd32e
8 changed files with 25 additions and 48 deletions

View File

@ -14,7 +14,7 @@
** resolve all identifiers by associating them with a particular
** table and column.
**
** $Id: resolve.c,v 1.17 2009/02/23 17:33:50 danielk1977 Exp $
** $Id: resolve.c,v 1.18 2009/02/24 10:14:40 danielk1977 Exp $
*/
#include "sqliteInt.h"
#include <stdlib.h>
@ -347,18 +347,14 @@ static int lookupName(
** column number is greater than the number of bits in the bitmask
** then set the high-order bit of the bitmask.
*/
if( pMatch ){
if( pExpr->iColumn>=0 ){
int n = pExpr->iColumn;
testcase( n==BMS-1 );
if( n>=BMS ){
n = BMS-1;
}
assert( pMatch->iCursor==pExpr->iTable );
pMatch->colUsed |= ((Bitmask)1)<<n;
}else{
pMatch->usesRowid = 1;
if( pExpr->iColumn>=0 && pMatch!=0 ){
int n = pExpr->iColumn;
testcase( n==BMS-1 );
if( n>=BMS ){
n = BMS-1;
}
assert( pMatch->iCursor==pExpr->iTable );
pMatch->colUsed |= ((Bitmask)1)<<n;
}
lookupname_end: