Initialize GISTScanOpaque->qual_ok even if there is no conditions.

This commit is contained in:
Teodor Sigaev 2008-12-04 11:08:46 +00:00
parent 754e6833ee
commit 69b3383cfb

@ -8,7 +8,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/access/gist/gistscan.c,v 1.73 2008/10/20 13:39:44 teodor Exp $ * $PostgreSQL: pgsql/src/backend/access/gist/gistscan.c,v 1.74 2008/12/04 11:08:46 teodor Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -76,6 +76,8 @@ gistrescan(PG_FUNCTION_ARGS)
ItemPointerSetInvalid(&so->curpos); ItemPointerSetInvalid(&so->curpos);
so->nPageData = so->curPageData = 0; so->nPageData = so->curPageData = 0;
so->qual_ok = true;
/* Update scan key, if a new one is given */ /* Update scan key, if a new one is given */
if (key && scan->numberOfKeys > 0) if (key && scan->numberOfKeys > 0)
{ {
@ -92,7 +94,6 @@ gistrescan(PG_FUNCTION_ARGS)
* Next, if any of keys is a NULL and that key is not marked with * Next, if any of keys is a NULL and that key is not marked with
* SK_SEARCHNULL then nothing can be found. * SK_SEARCHNULL then nothing can be found.
*/ */
so->qual_ok = true;
for (i = 0; i < scan->numberOfKeys; i++) { for (i = 0; i < scan->numberOfKeys; i++) {
scan->keyData[i].sk_func = so->giststate->consistentFn[scan->keyData[i].sk_attno - 1]; scan->keyData[i].sk_func = so->giststate->consistentFn[scan->keyData[i].sk_attno - 1];