diff options
Diffstat (limited to 'src/backend/access/index/istrat.c')
| -rw-r--r-- | src/backend/access/index/istrat.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/backend/access/index/istrat.c b/src/backend/access/index/istrat.c index 3fc972a09a1..01825cc6848 100644 --- a/src/backend/access/index/istrat.c +++ b/src/backend/access/index/istrat.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/index/Attic/istrat.c,v 1.15 1998/01/07 21:01:45 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/index/Attic/istrat.c,v 1.16 1998/01/15 19:42:02 pgsql Exp $ * *------------------------------------------------------------------------- */ @@ -242,22 +242,22 @@ StrategyTermEvaluate(StrategyTerm term, switch (operator->flags ^ entry->sk_flags) { case 0x0: - tmpres = (long) FMGR_PTR2(entry->sk_func, entry->sk_procedure, + tmpres = (long) FMGR_PTR2(&entry->sk_func, left, right); break; case SK_NEGATE: - tmpres = (long) !FMGR_PTR2(entry->sk_func, entry->sk_procedure, + tmpres = (long) !FMGR_PTR2(&entry->sk_func, left, right); break; case SK_COMMUTE: - tmpres = (long) FMGR_PTR2(entry->sk_func, entry->sk_procedure, + tmpres = (long) FMGR_PTR2(&entry->sk_func, right, left); break; case SK_NEGATE | SK_COMMUTE: - tmpres = (long) !FMGR_PTR2(entry->sk_func, entry->sk_procedure, + tmpres = (long) !FMGR_PTR2(&entry->sk_func, right, left); break; @@ -521,7 +521,8 @@ OperatorRelationFillScanKeyEntry(Relation operatorRelation, entry->sk_flags = 0; entry->sk_procedure = ((OperatorTupleForm) GETSTRUCT(tuple))->oprcode; - fmgr_info(entry->sk_procedure, &entry->sk_func, &entry->sk_nargs); + fmgr_info(entry->sk_procedure, &entry->sk_func); + entry->sk_nargs = entry->sk_func.fn_nargs; if (!RegProcedureIsValid(entry->sk_procedure)) { |