From 2d2e7bd32e7267bd9fe9c40a0b5c97cace2bd17e Mon Sep 17 00:00:00 2001
From: danielk1977 <danielk1977@noemail.net>
Date: Tue, 24 Feb 2009 10:14:40 +0000
Subject: Reverse commit (6315) for now. (CVS 6317)

FossilOrigin-Name: 0e7c369c23a8767b4d3e5cdd47c14716992fb71a
---
 src/resolve.c | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

(limited to 'src/resolve.c')

diff --git a/src/resolve.c b/src/resolve.c
index 29f1f2b92..749e473d4 100644
--- a/src/resolve.c
+++ b/src/resolve.c
@@ -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:
-- 
cgit v1.2.3