← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/postgresql-9.1/oneiric-security

« back to all changes in this revision

Viewing changes to src/backend/executor/nodeHashjoin.c

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2011-06-14 09:53:29 UTC
  • mto: (6.1.1 sid) (10.1.1 oneiric-proposed) (1.2.1)
  • mto: This revision was merged to the branch mainline in revision 5.
  • Revision ID: james.westby@ubuntu.com-20110614095329-71gfhjywyp2c27au
Tags: upstream-9.1~beta2
Import upstream version 9.1~beta2

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/backend/executor/nodeHashjoin.c
19
19
#include "executor/hashjoin.h"
20
20
#include "executor/nodeHash.h"
21
21
#include "executor/nodeHashjoin.h"
 
22
#include "miscadmin.h"
22
23
#include "utils/memutils.h"
23
24
 
24
25
 
263
264
                        case HJ_SCAN_BUCKET:
264
265
 
265
266
                                /*
 
267
                                 * We check for interrupts here because this corresponds to
 
268
                                 * where we'd fetch a row from a child plan node in other join
 
269
                                 * types.
 
270
                                 */
 
271
                                CHECK_FOR_INTERRUPTS();
 
272
 
 
273
                                /*
266
274
                                 * Scan the selected hash bucket for matches to current outer
267
275
                                 */
268
276
                                if (!ExecScanHashBucket(node, econtext))