diff options
Diffstat (limited to 'src/backend/optimizer')
-rw-r--r-- | src/backend/optimizer/path/clausesel.c | 4 | ||||
-rw-r--r-- | src/backend/optimizer/plan/subselect.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/backend/optimizer/path/clausesel.c b/src/backend/optimizer/path/clausesel.c index ea1582f1d2c..09d6d277c9a 100644 --- a/src/backend/optimizer/path/clausesel.c +++ b/src/backend/optimizer/path/clausesel.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/path/clausesel.c,v 1.30 2000/01/26 05:56:34 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/path/clausesel.c,v 1.31 2000/03/17 02:36:14 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -340,7 +340,7 @@ clause_selectivity(Query *root, */ Index varno = ((Var *) clause)->varno; - if (varRelid == 0 || varRelid == varno) + if (varRelid == 0 || varRelid == (int) varno) s1 = restriction_selectivity(F_EQSEL, BooleanEqualOperator, getrelid(varno, root->rtable), diff --git a/src/backend/optimizer/plan/subselect.c b/src/backend/optimizer/plan/subselect.c index 16f4a95a785..eedac18b207 100644 --- a/src/backend/optimizer/plan/subselect.c +++ b/src/backend/optimizer/plan/subselect.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/subselect.c,v 1.31 2000/03/14 02:23:15 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/subselect.c,v 1.32 2000/03/17 02:36:15 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -28,7 +28,7 @@ #include "utils/lsyscache.h" -int PlannerQueryLevel; /* level of current query */ +Index PlannerQueryLevel; /* level of current query */ List *PlannerInitPlan; /* init subplans for current query */ List *PlannerParamVar; /* to get Var from Param->paramid */ int PlannerPlanId; /* to assign unique ID to subquery plans */ @@ -55,7 +55,7 @@ int PlannerPlanId; /* to assign unique ID to subquery plans */ * is set from the absolute level value given by varlevel. */ static int -new_param(Var *var, int varlevel) +new_param(Var *var, Index varlevel) { Var *paramVar = (Var *) copyObject(var); @@ -75,7 +75,7 @@ replace_var(Var *var) { List *ppv; Param *retval; - int varlevel; + Index varlevel; int i; Assert(var->varlevelsup > 0 && var->varlevelsup < PlannerQueryLevel); |