Cleanup of OR fix.

diff --git a/src/backend/executor/nodeIndexscan.c b/src/backend/executor/nodeIndexscan.c
index 0f9be0a129d85097b1a451b78c4cc25927c0c7c5..f964c18f8cb59b0ee91adbe711f02a7b711a9350 100644 (file)
--- a/src/backend/executor/nodeIndexscan.c
+++ b/src/backend/executor/nodeIndexscan.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/executor/nodeIndexscan.c,v 1.20 1998/08/01 22:12:04 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/executor/nodeIndexscan.c,v 1.21 1998/08/01 22:44:52 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -305,7 +305,7 @@ ExecIndexReScan(IndexScan *node, ExprContext *exprCtxt, Plan *parent)
            skey = scanKeys[i];
            index_rescan(sdesc, direction, skey);
        }
-
+   }
    /* ----------------
     *  perhaps return something meaningful
     * ----------------
@@ -328,12 +328,14 @@ ExecEndIndexScan(IndexScan *node)
    IndexScanState *indexstate;
    Pointer    *runtimeKeyInfo;
    ScanKey    *scanKeys;
+   List       *indxqual;
    int        *numScanKeys;
    int         numIndices;
    int         i;
 
    scanstate = node->scan.scanstate;
    indexstate = node->indxstate;
+   indxqual = node->indxqual;
    runtimeKeyInfo = (Pointer *) indexstate->iss_RuntimeKeyInfo;
    
    /* ----------------

diff --git a/src/backend/optimizer/path/indxpath.c b/src/backend/optimizer/path/indxpath.c
index b557d9d59b34d2a7b3bdbbd8ce4fdcde0b7f8739..851ca064deb43ff41e6d33533cc93485dc21cbf2 100644 (file)
--- a/src/backend/optimizer/path/indxpath.c
+++ b/src/backend/optimizer/path/indxpath.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/optimizer/path/indxpath.c,v 1.20 1998/08/01 22:12:12 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/optimizer/path/indxpath.c,v 1.21 1998/08/01 22:44:53 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -143,7 +143,6 @@ find_index_paths(Query *root,
                                  index->indexkeys[0],
                                  index->classlist[0],
                                  clauseinfo_list);
-       }
    
        /*
         * 2. If the keys of this index match any of the available restriction

diff --git a/src/backend/parser/gram.c b/src/backend/parser/gram.c
index ec25316859a6159b666ec19607420055e1c253ac..591de82dd7fe521a66ce77a7684ad2e027074592 100644 (file)
--- a/src/backend/parser/gram.c
+++ b/src/backend/parser/gram.c
@@ -219,7 +219,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/parser/Attic/gram.c,v 2.21 1998/08/01 19:30:23 scrappy Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/parser/Attic/gram.c,v 2.22 1998/08/01 22:44:55 momjian Exp $
  *
  * HISTORY
  *   AUTHOR            DATE            MAJOR EVENT
@@ -3927,7 +3927,7 @@ static const short yycheck[] = {     3,
    182
 };
 /* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
-#line 3 "/usr/share/misc/bison.simple"
+#line 3 "/usr/local/bison/bison.simple"
 
 /* Skeleton output parser for bison,
    Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc.
@@ -4120,7 +4120,7 @@ __yy_memcpy (char *to, char *from, int count)
 #endif
 #endif
 \f
-#line 196 "/usr/share/misc/bison.simple"
+#line 196 "/usr/local/bison/bison.simple"
 
 /* The user can define YYPARSE_PARAM as the name of an argument to be passed
    into yyparse.  The argument should have type void *.
@@ -9518,7 +9518,7 @@ case 854:
     break;}
 }
    /* the action file gets copied in in place of this dollarsign */
-#line 498 "/usr/share/misc/bison.simple"
+#line 498 "/usr/local/bison/bison.simple"
 \f
   yyvsp -= yylen;
   yyssp -= yylen;