]> granicus.if.org Git - postgresql/commitdiff
Initialize GISTScanOpaque->qual_ok even if there is no conditions.
authorTeodor Sigaev <teodor@sigaev.ru>
Thu, 4 Dec 2008 11:10:06 +0000 (11:10 +0000)
committerTeodor Sigaev <teodor@sigaev.ru>
Thu, 4 Dec 2008 11:10:06 +0000 (11:10 +0000)
src/backend/access/gist/gistscan.c

index 05e47b9dc3aaaa781c8eb641d232cb41d28467aa..39e7d32bf29173829fb94bc5933440478d3a24f7 100644 (file)
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *       $PostgreSQL: pgsql/src/backend/access/gist/gistscan.c,v 1.68.2.3 2008/10/22 12:54:25 teodor Exp $
+ *       $PostgreSQL: pgsql/src/backend/access/gist/gistscan.c,v 1.68.2.4 2008/12/04 11:10:06 teodor Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -84,6 +84,8 @@ gistrescan(PG_FUNCTION_ARGS)
        ItemPointerSetInvalid(&so->markpos);
        so->nPageData = so->curPageData = 0;
 
+       so->qual_ok = true;
+
        /* Update scan key, if a new one is given */
        if (key && scan->numberOfKeys > 0)
        {
@@ -100,7 +102,6 @@ gistrescan(PG_FUNCTION_ARGS)
                 * Next, if any of keys is a NULL and that key is not marked with
                 * SK_SEARCHNULL then nothing can be found.
                 */
-               so->qual_ok = true;
                for (i = 0; i < scan->numberOfKeys; i++) {
                        scan->keyData[i].sk_func = so->giststate->consistentFn[scan->keyData[i].sk_attno - 1];