~ubuntu-branches/ubuntu/karmic/postgresql-8.4/karmic-security

« back to all changes in this revision

Viewing changes to src/backend/optimizer/plan/planner.c

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2009-05-05 00:58:06 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20090505005806-c19tt7oyqb7kuw49
Tags: 8.4~beta1+cvs20090503-1
New upstream snapshot.

Show diffs side-by-side

added added

removed removed

Lines of Context:
324
324
         * this query.
325
325
         */
326
326
        parse->jointree = (FromExpr *)
327
 
                pull_up_subqueries(root, (Node *) parse->jointree, false, false);
 
327
                pull_up_subqueries(root, (Node *) parse->jointree, NULL, NULL);
328
328
 
329
329
        /*
330
330
         * Detect whether any rangetable entries are RTE_JOIN kind; if not, we can
2236
2236
         * and window specifications.
2237
2237
         */
2238
2238
        sub_tlist = flatten_tlist(tlist);
2239
 
        extravars = pull_var_clause(parse->havingQual, true);
 
2239
        extravars = pull_var_clause(parse->havingQual, PVC_INCLUDE_PLACEHOLDERS);
2240
2240
        sub_tlist = add_to_flat_tlist(sub_tlist, extravars);
2241
2241
        list_free(extravars);
2242
2242
        *need_tlist_eval = false;       /* only eval if not flat tlist */