git.postgresql.org Git - postgresql.git/commitdiff

diff --git a/src/backend/executor/nodeIndexscan.c b/src/backend/executor/nodeIndexscan.c

index 7b96723844bd93f7450c6ad2e2a3df7f4831a1ad..a7cfce15b4cbee70ad136cc2b72ef78d588064b5 100644 (file)

--- a/src/backend/executor/nodeIndexscan.c

+++ b/src/backend/executor/nodeIndexscan.c

*

*

* IDENTIFICATION

- * $Header: /cvsroot/pgsql/src/backend/executor/nodeIndexscan.c,v 1.75 2002年12月15日 16:17:46 tgl Exp $

+ * $Header: /cvsroot/pgsql/src/backend/executor/nodeIndexscan.c,v 1.76 2002年12月18日 00:14:24 tgl Exp $

*

*-------------------------------------------------------------------------

*/

int indexPtr;

indexPtr = node->iss_MarkIndexPtr = node->iss_IndexPtr;

- indexScanDescs = node->iss_ScanDescs;

- scanDesc = indexScanDescs[indexPtr];

+ if (indexPtr >= 0 && indexPtr < node->iss_NumIndices)

+ {

+ indexScanDescs = node->iss_ScanDescs;

+ scanDesc = indexScanDescs[indexPtr];

- index_markpos(scanDesc);

+ index_markpos(scanDesc);

+ }

}

/* ----------------------------------------------------------------

* old comments

* Restores scan position by restoring the current index.

* Returns nothing.

- *

- * XXX Assumes previously marked scan position belongs to current index

* ----------------------------------------------------------------

*/

void

int indexPtr;

indexPtr = node->iss_IndexPtr = node->iss_MarkIndexPtr;

- indexScanDescs = node->iss_ScanDescs;

- scanDesc = indexScanDescs[indexPtr];

+ if (indexPtr >= 0 && indexPtr < node->iss_NumIndices)

+ {

+ indexScanDescs = node->iss_ScanDescs;

+ scanDesc = indexScanDescs[indexPtr];

- index_restrpos(scanDesc);

+ index_restrpos(scanDesc);

+ }

}

/* ----------------------------------------------------------------