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

« back to all changes in this revision

Viewing changes to src/backend/executor/nodeSubplan.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:
432
432
        int                     ncols = list_length(subplan->paramIds);
433
433
        ExprContext *innerecontext = node->innerecontext;
434
434
        MemoryContext oldcontext;
435
 
        int                     nbuckets;
 
435
        long            nbuckets;
436
436
        TupleTableSlot *slot;
437
437
 
438
438
        Assert(subplan->subLinkType == ANY_SUBLINK);
458
458
        node->havehashrows = false;
459
459
        node->havenullrows = false;
460
460
 
461
 
        nbuckets = (int) ceil(planstate->plan->plan_rows);
 
461
        nbuckets = (long) Min(planstate->plan->plan_rows, (double) LONG_MAX);
462
462
        if (nbuckets < 1)
463
463
                nbuckets = 1;
464
464